deepmedia · 0xera · Sep 27, 2025 · Sep 27, 2025 · Sep 27, 2025
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ pluginManagement {
 // build.gradle.kts
 plugins {
     id("com.android.library")
-    id("io.deepmedia.tools.grease") version "0.3.4"
+    id("io.deepmedia.tools.grease") version "0.3.6"
 }
 ```
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.4"
+agp = "8.11.2"
 apache-ant = "1.10.14"
 asm-commons = "9.6"
 android-tools = "31.1.4"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/grease/build.gradle.kts b/grease/build.gradle.kts
@@ -7,13 +7,12 @@ plugins {
 }
 
 group = "io.deepmedia.tools"
-version = "0.3.5"
+version = "0.3.6"
 
 testing {
     suites {
         register<JvmTestSuite>("functionalTest") {
             useJUnit()
-            testType.set(TestSuiteType.FUNCTIONAL_TEST)
 
             dependencies {
                 implementation(gradleTestKit())

diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt
@@ -175,7 +175,7 @@ open class GreasePlugin : Plugin<Project> {
                     /* Extra outputs that can probably be null. */
                     outAaptSafeManifestLocation = null,
                     /* Either LIBRARY or APPLICATION. When using LIBRARY we can't add lib dependencies */
-                    mergeType = ManifestMerger2.MergeType.FUSED_LIBRARY,
+                    mergeType = ManifestMerger2.MergeType.LIBRARY,
                     /* Manifest placeholders. Doing this the way the library manifest does. */
                     placeHolders = mergedFlavor?.manifestPlaceholders.orEmpty() + variant.manifestPlaceholders.get(),
                     /* Optional features to be enabled. */

diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt
@@ -132,7 +132,7 @@ internal fun Project.createProductFlavorConfigurations(
 // Create one configuration per build type.
 // Make it extend the root configuration so that artifacts are inherited.
 internal fun Project.createBuildTypeConfigurations(
-    buildTypes: NamedDomainObjectContainer<BuildType>,
+    buildTypes: NamedDomainObjectContainer<out BuildType>,
     isTransitive: Boolean,
     log: Logger
 ) {

diff --git a/tests/gradle/wrapper/gradle-wrapper.jar b/tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/tests/gradle/wrapper/gradle-wrapper.properties b/tests/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-milestone-1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/tests/gradlew b/tests/gradlew