Merge pull request #120 from gradle/tt/new-android-templates-from-int…

…ellij-new-project Add build specs for Empty and Basic Activity Android Applications and other upgrades
gradle · Oct 24, 2024 · c472ed0 · c472ed0
2 parents 4edbd54 + e001341
commit c472ed0
Show file tree

Hide file tree

Showing 153 changed files with 2,343 additions and 482 deletions.
diff --git a/...ttings/plugin/src/main/java/org/gradle/experimental/settings/WorkspaceSettingsPlugin.java b/...ttings/plugin/src/main/java/org/gradle/experimental/settings/WorkspaceSettingsPlugin.java
@@ -14,7 +14,7 @@
 /**
  * A plugin that allows you to configure the workspace settings.
  */
-abstract public class WorkspaceSettingsPlugin implements Plugin<Settings> {
+public abstract class WorkspaceSettingsPlugin implements Plugin<Settings> {
     public void apply(Settings settings) {
         settings.getExtensions().create("workspace", DefaultWorkspaceSettings.class, settings);
     }

diff --git a/...gin/src/main/java/org/gradle/experimental/settings/internal/AbstractProjectContainer.java b/...gin/src/main/java/org/gradle/experimental/settings/internal/AbstractProjectContainer.java
@@ -16,7 +16,7 @@
 import static org.gradle.experimental.settings.ProjectSpecification.LOGICAL_PATH_SEPARATOR;
 import static org.gradle.experimental.settings.ProjectSpecification.logicalPathFromParent;
 
-abstract public class AbstractProjectContainer implements ProjectContainer {
+public abstract class AbstractProjectContainer implements ProjectContainer {
     public static final String PROJECT_MARKER_FILE = "build.gradle.kts";
 
     protected final Settings settings;

diff --git a/.../src/main/java/org/gradle/experimental/settings/internal/DefaultProjectSpecification.java b/.../src/main/java/org/gradle/experimental/settings/internal/DefaultProjectSpecification.java
@@ -9,7 +9,7 @@
 
 import static org.gradle.experimental.settings.ProjectSpecification.logicalPathFromParent;
 
-abstract public class DefaultProjectSpecification extends AbstractProjectContainer implements ProjectSpecification {
+public abstract class DefaultProjectSpecification extends AbstractProjectContainer implements ProjectSpecification {
     @Inject
     public DefaultProjectSpecification(Settings settings, File dir, String logicalPath, ProjectContainer parent, ProjectSpecificationFactory projectSpecificationFactory) {
         super(settings, dir, logicalPath, parent, projectSpecificationFactory);

diff --git a/.../main/java/org/gradle/experimental/settings/internal/DefaultRootProjectSpecification.java b/.../main/java/org/gradle/experimental/settings/internal/DefaultRootProjectSpecification.java
@@ -7,7 +7,7 @@
 import java.io.File;
 import java.util.function.Predicate;
 
-abstract public class DefaultRootProjectSpecification extends AbstractProjectContainer implements RootProjectSpecification {
+public abstract class DefaultRootProjectSpecification extends AbstractProjectContainer implements RootProjectSpecification {
     @Inject
     public DefaultRootProjectSpecification(Settings settings, ProjectSpecificationFactory projectSpecificationFactory) {
         super(settings, settings.getRootDir(), "", null, projectSpecificationFactory);

diff --git a/...gin/src/main/java/org/gradle/experimental/settings/internal/DefaultWorkspaceSettings.java b/...gin/src/main/java/org/gradle/experimental/settings/internal/DefaultWorkspaceSettings.java
@@ -12,7 +12,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-abstract public class DefaultWorkspaceSettings implements WorkspaceSettings {
+public abstract class DefaultWorkspaceSettings implements WorkspaceSettings {
     private final Settings settings;
     private final ProjectSpecificationFactory projectSpecificationFactory;
     private boolean projectsConfigured;

diff --git a/unified-prototype/build.gradle.kts b/unified-prototype/build.gradle.kts
diff --git a/unified-prototype/gradle.properties b/unified-prototype/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=1g
-android.useAndroidX=true
+android.useAndroidX=true
+
+# Supress "The selected Xcode version (15.4) is higher than the maximum known to the Kotlin Gradle Plugin."
+kotlin.apple.xcodeCompatibility.nowarn=true
diff --git a/unified-prototype/gradle/wrapper/gradle-wrapper.properties b/unified-prototype/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.11-20240927185041+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.12-20241024175615+0000-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/unified-prototype/java-util/build.gradle.dcl b/unified-prototype/java-util/build.gradle.dcl
@@ -1,3 +1,3 @@
 javaLibrary {
-    javaVersion = 11
+    javaVersion = 17
 }