Merge branch 'tt/add-gradle-plugin-plugin-support'

Author: tresat

unified-prototype/unified-plugin/internal-testing-utils/src/main/groovy/org/gradle/integtests/fixtures/AbstractBuildInitSpecification.groovy

@@ -30,7 +30,9 @@ abstract class AbstractBuildInitSpecification extends AbstractSpecification {
         canBuildGeneratedProject()
 
         and:
-        true
+        if (shouldValidateLatestPublishedVersionUsedInSpec()) {
+            validateLatestPublishedVersionUsedInSpec()
+        }
         validateBuild()
     }
 
@@ -55,4 +57,33 @@ abstract class AbstractBuildInitSpecification extends AbstractSpecification {
                 .forwardOutput()
                 .build()
     }
+
+    protected boolean shouldValidateLatestPublishedVersionUsedInSpec() {
+        return true
+    }
+
+    protected void validateLatestPublishedVersionUsedInSpec() {
+        def pendingProjectVersion = readProjectVersion(file("../../../../../../version.txt"))
+        def lastPublishedVersion = previousVersion(pendingProjectVersion)
+        def specVersion = readSpecVersion(projectDir.file("settings.gradle.dcl"))
+        assert lastPublishedVersion == specVersion, "Expected spec to use last published version $lastPublishedVersion, but it was using $specVersion instead.  Please update this."
+    }
+
+    private String readProjectVersion(File versionFile) {
+        def content = versionFile.text
+        return content.trim()
+    }
+
+    protected String readSpecVersion(File settingsFile) {
+        def content = settingsFile.text
+        def matcher = content =~ /id\("org\.gradle\.experimental\..*"\)\.version\("([^"]+)"\)/
+        return (matcher.find()) ? matcher.group(1) : null
+    }
+
+    private String previousVersion(String version) {
+        if (version.endsWith("-SNAPSHOT")) {
+            version = version - "-SNAPSHOT"
+        }
+        return version[0..-2] + (version[-1].toInteger() - 1)
+    }
 }

unified-prototype/unified-plugin/plugin-android-init/src/integTest/groovy/org/gradle/api/experimental/android/AndroidApplicationAgpPreview.groovy

@@ -0,0 +1,13 @@
+package org.gradle.api.experimental.android
+
+class AndroidApplicationAgpPreviewBuildInitSpec extends AbstractAndroidBuildInitSpec {
+    @Override
+    protected String getProjectSpecType() {
+        return "android-application-agp-preview"
+    }
+
+    @Override
+    protected boolean shouldValidateLatestPublishedVersionUsedInSpec() {
+        return false // Specs using official AGP versions don't use the prototype plugins
+    }
+}

unified-prototype/unified-plugin/plugin-android-init/src/integTest/groovy/org/gradle/api/experimental/android/AndroidApplicationAgpPreviewBuildInitSpec.groovy

@@ -23,12 +23,8 @@ androidApplication {
                 enabled = false
             }
 
-            defaultProguardFile {
-                name = "proguard-android-optimize.txt"
-            }
-            proguardFile {
-                name = "proguard-rules.pro"
-            }
+            defaultProguardFiles = listOf(proguardFile("proguard-android-optimize.txt"))
+            proguardFiles = listOf(proguardFile("proguard-rules.pro"))
         }
     }
 }

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/build.gradle.dcl

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.experimental.android-ecosystem").version("0.1.30")
+    id("org.gradle.experimental.android-ecosystem").version("0.1.40")
 }
 
 dependencyResolutionManagement {

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl

@@ -23,12 +23,8 @@ androidApplication {
                 enabled = false
             }
 
-            defaultProguardFile {
-                name = "proguard-android-optimize.txt"
-            }
-            proguardFile {
-                name = "proguard-rules.pro"
-            }
+            defaultProguardFiles = listOf(proguardFile("proguard-android-optimize.txt"))
+            proguardFiles = listOf(proguardFile("proguard-rules.pro"))
         }
 
         debug {

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/build.gradle.dcl

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.experimental.android-ecosystem").version("0.1.30")
+    id("org.gradle.experimental.android-ecosystem").version("0.1.40")
 }
 
 dependencyResolutionManagement {

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.experimental.android-ecosystem").version("0.1.30")
+    id("org.gradle.experimental.android-ecosystem").version("0.1.40")
 }
 
 rootProject.name = "example-android-app"

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl

@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.experimental.jvm-ecosystem").version("0.1.30")
+    id("org.gradle.experimental.jvm-ecosystem").version("0.1.40")
 }
 
 rootProject.name = "example-java-app"

unified-prototype/unified-plugin/plugin-jvm/src/main/resources/templates/java-application/settings.gradle.dcl

@@ -5,7 +5,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.experimental.kmp-ecosystem").version("0.1.30")
+    id("org.gradle.experimental.kmp-ecosystem").version("0.1.40")
 }
 
 dependencyResolutionManagement {