Skip to content

Commit 0a73efa

Browse files
codeanticodecodeanticode
committed
updated gradle wrapper and tooling-api versions
1 parent da2edef commit 0a73efa

File tree

13 files changed

+64
-37
lines changed

13 files changed

+64
-37
lines changed

‎mode/.classpath

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
3+
<classpathentry kind="src" output="bin/main" path="src">
54
<attributes>
6-
<attribute name="module" value="true"/>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="lib" path="mode/jdi.jar"/>
10-
<classpathentry kind="lib" path="mode/jdimodel.jar"/>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
10+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
1111
<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
1212
<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
1313
<classpathentry combineaccessrules="false" kind="src" path="/processing4-java"/>
14-
<classpathentry kind="lib" path="mode/istack-commons-runtime.jar"/>
15-
<classpathentry kind="lib" path="mode/javax.activation-api.jar"/>
16-
<classpathentry kind="lib" path="mode/jaxb-api.jar"/>
17-
<classpathentry kind="lib" path="mode/jaxb-jxc.jar"/>
18-
<classpathentry kind="lib" path="mode/jaxb-runtime.jar"/>
19-
<classpathentry kind="lib" path="mode/jaxb-xjc.jar"/>
20-
<classpathentry kind="lib" path="mode/gradle-tooling-api-6.8.3.jar"/>
2114
<classpathentry kind="var" path="ANDROID_JAR"/>
2215
<classpathentry kind="var" path="ANDROID_SDK"/>
23-
<classpathentry kind="output" path="core/bin"/>
16+
<classpathentry kind="output" path="bin/default"/>
2417
</classpath>

‎mode/.project

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>android-mode</name>
3+
<name>mode</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,8 +10,25 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1622
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1650246874247</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
1734
</projectDescription>

‎mode/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=17
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12-
org.eclipse.jdt.core.compiler.source=1.7
12+
org.eclipse.jdt.core.compiler.source=17

‎mode/mode/JavaMode.jar

13.9 KB
Binary file not shown.

‎mode/mode/core.jar

18.8 KB
Binary file not shown.

‎mode/mode/gradlew.zip

-50.9 KB
Binary file not shown.

‎mode/mode/pde.jar

-9.74 KB
Binary file not shown.

‎mode/src/processing/mode/android/AndroidEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public void actionPerformed(ActionEvent e) {
133133

134134

135135
String exportProjectTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT_PROJECT, true);
136-
JMenuItem exportProject = Toolkit.newJMenuItem(exportProjectTitle, 'P');
136+
JMenuItem exportProject = Toolkit.newJMenuItemShift(exportProjectTitle, 'X');
137137
exportProject.addActionListener(new ActionListener() {
138138
public void actionPerformed(ActionEvent e) {
139139
handleExportProject();

‎mode/src/processing/mode/android/AndroidSDK.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,10 @@ static public AndroidSDK download(final Frame editor, final AndroidMode androidM
513513
AndroidMode.getTextString("android_sdk.dialog.sdk_license_rejected_body"));
514514
}
515515

516-
if (Platform.isLinux() && Platform.getNativeBits() == 32) {
517-
AndroidUtil.showMessage(AndroidMode.getTextString("android_sdk.dialog.32bit_system_title"),
518-
AndroidMode.getTextString("android_sdk.dialog.32bit_system_body", SYSTEM_32BIT_URL));
519-
}
516+
// if (Platform.isLinux() && Platform.getNativeBits() == 32) {
517+
// AndroidUtil.showMessage(AndroidMode.getTextString("android_sdk.dialog.32bit_system_title"),
518+
// AndroidMode.getTextString("android_sdk.dialog.32bit_system_body", SYSTEM_32BIT_URL));
519+
// }
520520

521521
return sdk;
522522
}

‎mode/tools/SDKUpdater/.classpath

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
3+
<classpathentry kind="src" output="bin/main" path="src">
54
<attributes>
6-
<attribute name="module" value="true"/>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
10+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
911
<classpathentry combineaccessrules="false" kind="src" path="/android-mode"/>
10-
<classpathentry kind="lib" path="lib/sdklib-27.1.1.jar"/>
11-
<classpathentry kind="lib" path="lib/repository-27.1.1.jar"/>
1212
<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
13-
<classpathentry kind="output" path="bin"/>
13+
<classpathentry kind="output" path="bin/default"/>
1414
</classpath>

‎mode/tools/SDKUpdater/.project

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>android-mode-sdkupdater</name>
3+
<name>SDKUpdater</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,8 +10,25 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1622
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1650246874238</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
1734
</projectDescription>

‎mode/tools/SDKUpdater/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.7
6+
org.eclipse.jdt.core.compiler.compliance=17
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1111
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12-
org.eclipse.jdt.core.compiler.source=1.7
12+
org.eclipse.jdt.core.compiler.source=17

‎mode/version.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Basics
22
android-platform = 30
33
android-toolslib = 27.1.1
4-
android-gradle-plugin = 4.1.3
5-
gradle-wrapper = 6.8.3
4+
android-gradle-plugin = 7.1.0
5+
gradle-wrapper = 7.4.2
66

77
# Minimum SDK versions for each type of project
88
android-min-app = 17
@@ -20,8 +20,8 @@ androidx.legacy%legacy-support-v4 = 1.0.0
2020
com.google.android.support%wearable = 2.8.1
2121
com.google.android.gms%play-services-wearable = 17.0.0
2222
com.google.vr = 1.180.0
23-
com.google.ar = 1.22.0
24-
org.processing = 4.0.0b1
25-
org.gradle%gradle-tooling-api = 6.8.3
23+
com.google.ar = 1.30.0
24+
org.processing = 4.0.0b7
25+
org.gradle%gradle-tooling-api = 7.2
2626
org.slf4j = 1.7.30
2727
org.eclipse.jdt = 3.11.100

0 commit comments

Comments
 (0)