From 913188cfbcc68810131711cd15faff6a3655822c Mon Sep 17 00:00:00 2001 From: Tom Tresansky Date: Mon, 4 Nov 2024 10:13:11 -0500 Subject: [PATCH] Reset version to avoid problematic 0.1.24, update spec versions --- .../settings.gradle.dcl | 2 +- .../settings.gradle.dcl | 2 +- .../templates/android-application/settings.gradle.dcl | 2 +- .../templates/java-application/settings.gradle.dcl | 2 +- .../kmp/KotlinApplicationInitProjectSpec.groovy | 10 ---------- .../templates/kotlin-application/settings.gradle.dcl | 2 +- unified-prototype/unified-plugin/version.txt | 2 +- 7 files changed, 6 insertions(+), 16 deletions(-) diff --git a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl index 8cefea9d..4938014c 100644 --- a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl +++ b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("org.gradle.experimental.android-ecosystem").version("0.1.21") + id("org.gradle.experimental.android-ecosystem").version("0.1.23") } dependencyResolutionManagement { diff --git a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl index 4ea6b82b..7b344bad 100644 --- a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl +++ b/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.21") + id("org.gradle.experimental.android-ecosystem").version("0.1.23") } dependencyResolutionManagement { diff --git a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl index 252fb3a2..26a8f3dd 100644 --- a/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl +++ b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("org.gradle.experimental.android-ecosystem").version("0.1.21") + id("org.gradle.experimental.android-ecosystem").version("0.1.23") } rootProject.name = "example-android-app" diff --git a/unified-prototype/unified-plugin/plugin-jvm/src/main/resources/templates/java-application/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-jvm/src/main/resources/templates/java-application/settings.gradle.dcl index 8cbba8ea..dfe86e59 100644 --- a/unified-prototype/unified-plugin/plugin-jvm/src/main/resources/templates/java-application/settings.gradle.dcl +++ b/unified-prototype/unified-plugin/plugin-jvm/src/main/resources/templates/java-application/settings.gradle.dcl @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("org.gradle.experimental.jvm-ecosystem").version("0.1.21") + id("org.gradle.experimental.jvm-ecosystem").version("0.1.23") } rootProject.name = "example-java-app" diff --git a/unified-prototype/unified-plugin/plugin-kmp/src/integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy b/unified-prototype/unified-plugin/plugin-kmp/src/integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy index 79f00ffb..3aa3feb0 100644 --- a/unified-prototype/unified-plugin/plugin-kmp/src/integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy +++ b/unified-prototype/unified-plugin/plugin-kmp/src/integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy @@ -27,14 +27,4 @@ class KotlinApplicationInitProjectSpec extends AbstractBuildInitSpecification { assert result.output.contains("Hello World!") } - - @Override - protected void canBuildGeneratedProject() { - result = GradleRunner.create() - .withProjectDir(projectDir) - .withPluginClasspath() - .withArguments("build") - .forwardOutput() - .build() - } } diff --git a/unified-prototype/unified-plugin/plugin-kmp/src/main/resources/templates/kotlin-application/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-kmp/src/main/resources/templates/kotlin-application/settings.gradle.dcl index ab4e9558..137014f1 100644 --- a/unified-prototype/unified-plugin/plugin-kmp/src/main/resources/templates/kotlin-application/settings.gradle.dcl +++ b/unified-prototype/unified-plugin/plugin-kmp/src/main/resources/templates/kotlin-application/settings.gradle.dcl @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("org.gradle.experimental.kmp-ecosystem").version("0.1.21") + id("org.gradle.experimental.kmp-ecosystem").version("0.1.23") } dependencyResolutionManagement { diff --git a/unified-prototype/unified-plugin/version.txt b/unified-prototype/unified-plugin/version.txt index 4080538c..83dadc3b 100644 --- a/unified-prototype/unified-plugin/version.txt +++ b/unified-prototype/unified-plugin/version.txt @@ -1 +1 @@ -0.1.24-SNAPSHOT \ No newline at end of file +0.1.25-SNAPSHOT \ No newline at end of file