Merge branch 'main' into g/22050416/fix-issue-232

Author: Goooler

.github/renovate.json5

@@ -13,7 +13,14 @@
       "matchPackageNames": [
         "org.vafer:jdependency",
         "org.ow2.asm:asm-commons"
-      ]
-    }
+      ],
+    },
+    {
+      // AGP version should match the min Gradle version used in tests.
+      "enabled": false,
+      "matchPackageNames": [
+        'com.android.tools.build:gradle',
+      ],
+    },
   ]
 }

.github/workflows/build.yml

@@ -31,29 +31,6 @@ jobs:
       - uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew build "-PtestGradleVersion=${{ matrix.gradle }}"
 
-  # There's no need to run the update task frequently; the start scripts are typically updated with Gradle releases.
-  update-start-scripts:
-    runs-on: ubuntu-latest
-    if: github.event.repository.fork == false && github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: 21
-      - uses: gradle/actions/setup-gradle@v4
-      - run: ./gradlew downloadStartScripts
-      - uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: |
-            Update start script templates to the latest
-
-            _Auto-generated by `Update Start Scripts` Github workflow._
-          title: Update start script templates to the latest
-          body: _Auto-generated by `Update Start Scripts` Github workflow._
-          branch: actions/update-start-scripts
-          delete-branch: true
-
   publish-snapshot:
     needs: build
     runs-on: ubuntu-latest
@@ -67,11 +44,12 @@ jobs:
       - uses: gradle/actions/setup-gradle@v4
         with:
           cache-read-only: true
-      # TODO: https://github.com/gradle/gradle/issues/22779
-      - run: ./gradlew publishToMavenCentral --no-configuration-cache
+      - run: ./gradlew publishToMavenCentral
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_KEY_PASSWORD }}
       - uses: actions/upload-artifact@v4
         with:
           path: build/libs

.github/workflows/update-start-scripts.yml

@@ -0,0 +1,33 @@
+name: Update Start Scripts
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      # There's no need to run the update task frequently; the start scripts are typically updated with Gradle releases.
+      - gradle/wrapper/**
+  workflow_dispatch:
+
+jobs:
+  update-start-scripts:
+    runs-on: ubuntu-latest
+    if: github.event.repository.fork == false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: 21
+      - uses: gradle/actions/setup-gradle@v4
+      - run: ./gradlew downloadStartScripts
+      - uses: peter-evans/create-pull-request@v7
+        with:
+          commit-message: |
+            Update start script templates to the latest
+
+            _Auto-generated by `Update Start Scripts` Github workflow._
+          title: Update start script templates to the latest
+          body: _Auto-generated by `Update Start Scripts` Github workflow._
+          branch: actions/update-start-scripts
+          delete-branch: true

build.gradle.kts

@@ -4,7 +4,7 @@ import org.gradle.api.plugins.JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME
 import org.gradle.api.plugins.JavaPlugin.JAVADOC_ELEMENTS_CONFIGURATION_NAME
 import org.gradle.api.plugins.JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME
 import org.gradle.api.plugins.JavaPlugin.SOURCES_ELEMENTS_CONFIGURATION_NAME
-import org.gradle.kotlin.dsl.kotlin
+import org.jetbrains.kotlin.daemon.common.OSKind
 import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
@@ -96,6 +96,16 @@ publishing.publications.withType<MavenPublication>().configureEach {
   suppressPomMetadataWarningsFor(SOURCES_ELEMENTS_CONFIGURATION_NAME)
 }
 
+val testGradleVersion: String = providers.gradleProperty("testGradleVersion").orNull.let {
+  val value = if (it == null || it == "current") GradleVersion.current().version else it
+  logger.info("Using test Gradle version: $value")
+  value
+}
+
+develocity {
+  buildScan.value("testGradleVersion", testGradleVersion)
+}
+
 dependencies {
   compileOnly(libs.kotlin.kmp)
   api(libs.apache.ant) // Types from Ant are exposed in the public API.
@@ -107,6 +117,7 @@ dependencies {
   implementation(libs.plexus.utils)
   implementation(libs.plexus.xml)
 
+  testPluginClasspath(libs.agp)
   testPluginClasspath(libs.foojayResolver)
   testPluginClasspath(libs.kotlin.kmp)
   testPluginClasspath(libs.pluginPublish)
@@ -167,12 +178,7 @@ testing.suites {
     }
     targets.configureEach {
       testTask {
-        val testGradleVersion = providers.gradleProperty("testGradleVersion").orNull.let {
-          if (it == null || it == "current") GradleVersion.current().version else it
-        }
-        logger.info("Using test Gradle version: $testGradleVersion")
         systemProperty("TEST_GRADLE_VERSION", testGradleVersion)
-
         maxParallelForks = Runtime.getRuntime().availableProcessors()
       }
     }
@@ -224,6 +230,13 @@ tasks.validatePlugins {
   enableStricterValidation = true
 }
 
+tasks.whenTaskAdded {
+  if (name.contains("lint") && this::class.java.name.contains("com.android.build")) {
+    // Disable lint tasks for Windows due to ExceptionInInitializerError.
+    enabled = OSKind.current != OSKind.Windows
+  }
+}
+
 tasks.check {
   dependsOn(
     tasks.withType<Test>(),

docs/changes/README.md

@@ -5,6 +5,8 @@
 **Added**
 
 - Support disabling of string constant remapping. ([#1401](https://github.com/GradleUp/shadow/pull/1401))
+- Let `assemble` depend on `shadowJar`. ([#1524](https://github.com/GradleUp/shadow/pull/1524))
+- Fail build when inputting AAR files or using Shadow with AGP. ([#1530](https://github.com/GradleUp/shadow/pull/1530))
 
 **Fixed**
 

docs/configuration/merging/README.md

@@ -69,7 +69,7 @@ Additionally, a [`ResourceTransformer`][ResourceTransformer] can accept a `Closu
     import org.apache.tools.zip.ZipOutputStream
     import org.gradle.api.file.FileTreeElement
 
-    class MyTransformer(var enabled: Boolean = false) : ResourceTransformer {
+    class MyTransformer(@get:Input var enabled: Boolean = false) : ResourceTransformer {
       override fun canTransformResource(element: FileTreeElement): Boolean = true
       override fun transform(context: TransformerContext) {}
       override fun hasTransformedResource(): Boolean = true
@@ -92,7 +92,7 @@ Additionally, a [`ResourceTransformer`][ResourceTransformer] can accept a `Closu
     import org.gradle.api.file.FileTreeElement
 
     class MyTransformer implements ResourceTransformer {
-      boolean enabled
+      @Input boolean enabled
       @Override boolean canTransformResource(FileTreeElement element) { return true }
       @Override void transform(TransformerContext context) {}
       @Override boolean hasTransformedResource() { return true }
@@ -116,7 +116,7 @@ An instantiated instance of a [`ResourceTransformer`][ResourceTransformer] can a
     import org.apache.tools.zip.ZipOutputStream
     import org.gradle.api.file.FileTreeElement
 
-    class MyTransformer(val enabled: Boolean) : ResourceTransformer {
+    class MyTransformer(@get:Input val enabled: Boolean) : ResourceTransformer {
       override fun canTransformResource(element: FileTreeElement): Boolean = true
       override fun transform(context: TransformerContext) {}
       override fun hasTransformedResource(): Boolean = true
@@ -137,7 +137,7 @@ An instantiated instance of a [`ResourceTransformer`][ResourceTransformer] can a
     import org.gradle.api.file.FileTreeElement
 
     class MyTransformer implements ResourceTransformer {
-      final boolean enabled
+      @Input final boolean enabled
       MyTransformer(boolean enabled) { this.enabled = enabled }
       @Override boolean canTransformResource(FileTreeElement element) { return true }
       @Override void transform(TransformerContext context) {}

docs/publishing/README.md

@@ -85,12 +85,14 @@ the `archiveClassifier` of the shadowed JAR like the following:
     version = "1.0"
 
     dependencies {
+      val retrofitVersion = "2.12.0"
       // This will be bundled in the shadowed JAR and not declared in the POM.
-      implementation("some:a:1.0")
-      // This will be excluded
-      shadow("some:b:1.0")
-      // This will be excluded
-      compileOnly("some:c:1.0")
+      implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
+      // This will be excluded from the shadowed JAR but declared as a runtime dependency in `META-INF/MANIFEST.MF`
+      // file's `Class-Path` entry, and also in the POM file.
+      shadow("com.squareup.retrofit2:converter-java8:$retrofitVersion")
+      // This will be excluded from the shadowed JAR and not declared in the POM or `META-INF/MANIFEST.MF`.
+      compileOnly("com.squareup.retrofit2:converter-scalars:$retrofitVersion")
     }
 
     tasks.shadowJar {
@@ -122,13 +124,14 @@ the `archiveClassifier` of the shadowed JAR like the following:
     version = '1.0'
 
     dependencies {
+      def retrofitVersion = '2.12.0'
       // This will be bundled in the shadowed JAR and not declared in the POM.
-      implementation 'some:a:1.0'
+      implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
       // This will be excluded from the shadowed JAR but declared as a runtime dependency in `META-INF/MANIFEST.MF`
       // file's `Class-Path` entry, and also in the POM file.
-      shadow 'some:b:1.0'
+      shadow "com.squareup.retrofit2:converter-java8:$retrofitVersion"
       // This will be excluded from the shadowed JAR and not declared in the POM or `META-INF/MANIFEST.MF`.
-      compileOnly 'some:c:1.0'
+      compileOnly "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
     }
 
     tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {

gradle.properties

@@ -16,14 +16,14 @@ org.jetbrains.dokka.experimental.tryK2.nowarn=true
 
 ########## Properties for publishing to Maven Central ##########
 
+mavenCentralAutomaticPublishing=true
+mavenCentralPublishing=true
+signAllPublications=true
+
 GROUP=com.gradleup.shadow
 POM_ARTIFACT_ID=shadow-gradle-plugin
 VERSION_NAME=9.0.0-SNAPSHOT
 
-SONATYPE_AUTOMATIC_RELEASE=true
-SONATYPE_HOST=CENTRAL_PORTAL
-RELEASE_SIGNING_ENABLED=true
-
 POM_NAME=Shadow Gradle Plugin
 POM_DESCRIPTION=Gradle plugin to create fat/uber JARs, apply file transforms, and relocate packages for applications and libraries. Gradle version of Maven's Shade plugin.
 POM_INCEPTION_YEAR=2024

gradle/libs.versions.toml

@@ -5,9 +5,9 @@ pluginPublish = "1.3.1"
 
 [libraries]
 apache-ant = "org.apache.ant:ant:1.10.15"
-apache-commonsIo = "commons-io:commons-io:2.19.0"
+apache-commonsIo = "commons-io:commons-io:2.20.0"
 apache-log4j = "org.apache.logging.log4j:log4j-core:2.25.1"
-apache-maven-modelBuilder = "org.apache.maven:maven-model:3.9.10"
+apache-maven-modelBuilder = "org.apache.maven:maven-model:3.9.11"
 asm = "org.ow2.asm:asm-commons:9.8"
 # jdependency should be updated together with ASM, see https://github.com/tcurdt/jdependency/issues/325.
 jdependency = "org.vafer:jdependency:2.13"
@@ -21,18 +21,21 @@ moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "mosh
 foojayResolver = "org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:1.0.0"
 kotlin-kmp = { module = "org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin", version.ref = "kotlin" }
 pluginPublish = { module = "com.gradle.publish:plugin-publish-plugin", version.ref = "pluginPublish" }
+# AGP version should match the min Gradle version used in tests.
+# https://developer.android.com/build/releases/gradle-plugin#updating-gradle
+agp = "com.android.tools.build:gradle:8.8.0"
 
 androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha05"
 # Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.
-ktlint = "com.pinterest.ktlint:ktlint-cli:1.6.0"
+ktlint = "com.pinterest.ktlint:ktlint-cli:1.7.1"
 
-junit-bom = "org.junit:junit-bom:5.13.3"
+junit-bom = "org.junit:junit-bom:5.13.4"
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 android-lint = "com.android.lint:8.11.1"
 jetbrains-dokka = "org.jetbrains.dokka:2.0.0"
-mavenPublish = "com.vanniktech.maven.publish:0.33.0"
+mavenPublish = "com.vanniktech.maven.publish:0.34.0"
 pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish" }
-spotless = "com.diffplug.spotless:7.1.0"
+spotless = "com.diffplug.spotless:7.2.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME