remove support for publishing with the old Android Gradle APIs (#354)

* remove support for publishing with the old Android Gradle APIs * fix test * ktlint
vanniktech · Jun 3, 2022 · f838394 · f838394
1 parent 0a3d836
commit f838394
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 479 deletions.
diff --git a/plugin/src/integrationTest/fixtures/passing_android_7_1_1_project/build.gradle b/plugin/src/integrationTest/fixtures/passing_android_7_1_1_project/build.gradle
diff --git a/...c/integrationTest/fixtures/passing_android_7_1_1_project/expected/test-artifact-1.0.0.pom b/...c/integrationTest/fixtures/passing_android_7_1_1_project/expected/test-artifact-1.0.0.pom
diff --git a/...n/src/integrationTest/fixtures/passing_android_7_1_1_project/src/main/AndroidManifest.xml b/...n/src/integrationTest/fixtures/passing_android_7_1_1_project/src/main/AndroidManifest.xml
diff --git a/...g_android_7_1_1_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.java b/...g_android_7_1_1_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.java
diff --git a/...n/src/integrationTest/fixtures/passing_android_7_1_1_release_variant_project/build.gradle b/...n/src/integrationTest/fixtures/passing_android_7_1_1_release_variant_project/build.gradle
diff --git a/...t/fixtures/passing_android_7_1_1_release_variant_project/expected/test-artifact-1.0.0.pom b/...t/fixtures/passing_android_7_1_1_release_variant_project/expected/test-artifact-1.0.0.pom
diff --git a/...nTest/fixtures/passing_android_7_1_1_release_variant_project/src/main/AndroidManifest.xml b/...nTest/fixtures/passing_android_7_1_1_release_variant_project/src/main/AndroidManifest.xml
diff --git a/...release_variant_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.java b/...release_variant_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.java
diff --git a/plugin/src/integrationTest/fixtures/passing_android_project/build.gradle b/plugin/src/integrationTest/fixtures/passing_android_project/build.gradle
@@ -6,8 +6,9 @@ buildscript {
     }
 
     dependencies {
-       classpath "com.vanniktech:gradle-maven-publish-plugin:${System.getProperty("com.vanniktech.publish.version")}"
-       classpath "com.android.tools.build:gradle:7.0.0"
+        classpath "com.vanniktech:gradle-maven-publish-plugin:${System.getProperty("com.vanniktech.publish.version")}"
+        classpath "com.android.tools.build:gradle:7.1.2"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
     }
 }
 

diff --git a/plugin/src/integrationTest/fixtures/passing_android_project/expected/test-artifact-1.0.0.pom b/plugin/src/integrationTest/fixtures/passing_android_project/expected/test-artifact-1.0.0.pom
@@ -10,7 +10,7 @@
   <groupId>com.example</groupId>
   <artifactId>test-artifact</artifactId>
   <version>1.0.0</version>
-  <packaging>aar</packaging>
+  <packaging>pom</packaging>
   <name>Gradle Maven Publish Plugin Test Artifact</name>
   <description>Testing the Gradle Maven Publish Plugin</description>
   <url>https://github.com/vanniktech/gradle-maven-publish-plugin/</url>

diff --git a/plugin/src/integrationTest/fixtures/passing_android_with_kotlin_dokka_project/build.gradle b/plugin/src/integrationTest/fixtures/passing_android_with_kotlin_dokka_project/build.gradle
diff --git a/...nTest/fixtures/passing_android_with_kotlin_dokka_project/expected/test-artifact-1.0.0.pom b/...nTest/fixtures/passing_android_with_kotlin_dokka_project/expected/test-artifact-1.0.0.pom
diff --git a/...ationTest/fixtures/passing_android_with_kotlin_dokka_project/src/main/AndroidManifest.xml b/...ationTest/fixtures/passing_android_with_kotlin_dokka_project/src/main/AndroidManifest.xml
diff --git a/...otlin_dokka_project/src/main/java/com/vanniktech/maven/publish/test/JavaTestActivity.java b/...otlin_dokka_project/src/main/java/com/vanniktech/maven/publish/test/JavaTestActivity.java
diff --git a/...with_kotlin_dokka_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.kt b/...with_kotlin_dokka_project/src/main/java/com/vanniktech/maven/publish/test/TestActivity.kt
diff --git a/plugin/src/integrationTest/fixtures/passing_android_with_kotlin_project/build.gradle b/plugin/src/integrationTest/fixtures/passing_android_with_kotlin_project/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath "com.vanniktech:gradle-maven-publish-plugin:${System.getProperty("com.vanniktech.publish.version")}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
-        classpath "com.android.tools.build:gradle:7.0.0"
+        classpath "com.android.tools.build:gradle:7.1.2"
     }
 }
 

diff --git a/...grationTest/fixtures/passing_android_with_kotlin_project/expected/test-artifact-1.0.0.pom b/...grationTest/fixtures/passing_android_with_kotlin_project/expected/test-artifact-1.0.0.pom
@@ -10,7 +10,7 @@
   <groupId>com.example</groupId>
   <artifactId>test-artifact</artifactId>
   <version>1.0.0</version>
-  <packaging>aar</packaging>
+  <packaging>pom</packaging>
   <name>Gradle Maven Publish Plugin Test Artifact</name>
   <description>Testing the Gradle Maven Publish Plugin</description>
   <url>https://github.com/vanniktech/gradle-maven-publish-plugin/</url>
@@ -40,6 +40,7 @@
       <artifactId>kotlin-stdlib-jdk8</artifactId>
       <version>1.6.10</version>
       <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>
diff --git a/.../integrationTest/kotlin/com/vanniktech/maven/publish/MavenPublishPluginIntegrationTest.kt b/.../integrationTest/kotlin/com/vanniktech/maven/publish/MavenPublishPluginIntegrationTest.kt
@@ -101,33 +101,12 @@ class MavenPublishPluginIntegrationTest {
 
     val result = executeGradleCommands(TEST_TASK, "--stacktrace")
 
-    assertExpectedTasksRanSuccessfully(result)
-    assertExpectedCommonArtifactsGenerated(artifactExtension = "aar")
-    assertPomContentMatches()
-    assertSourceJarContainsFile("com/vanniktech/maven/publish/test/TestActivity.java", "src/main/java")
-  }
-
-  @Test fun generatesArtifactsAndDocumentationOnAndroid711Project() {
-    setupFixture("passing_android_7_1_1_project")
-
-    val result = executeGradleCommands(TEST_TASK, "--stacktrace")
-
     assertExpectedTasksRanSuccessfully(result)
     assertExpectedCommonArtifactsGenerated("aar", qualifier = "debug")
     assertExpectedCommonArtifactsGenerated("aar", qualifier = "release")
     assertPomContentMatches()
   }
 
-  @Test fun generatesArtifactsAndDocumentationOnAndroid711ReleaseVariantProject() {
-    setupFixture("passing_android_7_1_1_release_variant_project")
-
-    val result = executeGradleCommands(TEST_TASK, "--stacktrace")
-
-    assertExpectedTasksRanSuccessfully(result)
-    assertExpectedCommonArtifactsGenerated("aar")
-    assertPomContentMatches()
-  }
-
   @Test fun generatesArtifactsAndDocumentationOnAndroidSingleVariantProject() {
     setupFixture("passing_android_single_variant_project")
 
@@ -155,23 +134,9 @@ class MavenPublishPluginIntegrationTest {
     val result = executeGradleCommands(TEST_TASK, "--stacktrace")
 
     assertExpectedTasksRanSuccessfully(result)
-    assertExpectedCommonArtifactsGenerated(artifactExtension = "aar")
-    assertPomContentMatches()
-    assertSourceJarContainsFile("com/vanniktech/maven/publish/test/TestActivity.kt", "src/main/java")
-    assertSourceJarContainsFile("com/vanniktech/maven/publish/test/JavaTestActivity.java", "src/main/java")
-  }
-
-  @Test fun generatesArtifactsAndDocumentationOnAndroidWithKotlinDokkaProject() {
-    setupFixture("passing_android_with_kotlin_dokka_project")
-
-    val result = executeGradleCommands(TEST_TASK, "--stacktrace")
-
-    assertExpectedTasksRanSuccessfully(result, hasDokka = true)
-
-    assertExpectedCommonArtifactsGenerated(artifactExtension = "aar")
+    assertExpectedCommonArtifactsGenerated("aar", qualifier = "debug")
+    assertExpectedCommonArtifactsGenerated("aar", qualifier = "release")
     assertPomContentMatches()
-    assertSourceJarContainsFile("com/vanniktech/maven/publish/test/TestActivity.kt", "src/main/java")
-    assertSourceJarContainsFile("com/vanniktech/maven/publish/test/JavaTestActivity.java", "src/main/java")
   }
 
   @Test fun generatesArtifactsAndDocumentationOnKotlinMppProject() {