Apply android gradle 4.2.0 plugin support

ab180 · Aug 6, 2021 · 53a0559 · 53a0559
1 parent 161300c
commit 53a0559
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 29 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,40 @@
+plugins {
+    id("groovy")
+    id("maven-publish")
+}
+
+repositories {
+    google()
+    mavenCentral()
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+            groupId = "com.github.ab180"
+            artifactId = "fatjar"
+            version = "2.0.0"
+        }
+    }
+    repositories {
+        maven {
+            name = "local"
+            url = uri("$buildDir/maven")
+        }
+    }
+}
+
+dependencies {
+    implementation(gradleApi())
+    implementation(localGroovy())
+
+    implementation("com.android.tools.build:gradle:4.2.2")
+    implementation("org.zeroturnaround:zt-zip:1.13")
+    implementation("io.github.g00fy2:versioncompare:1.4.1")
+}
diff --git a/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy b/src/main/groovy/co/ab180/fatjar/FatJarProcessor.groovy
@@ -1,8 +1,8 @@
 package co.ab180.fatjar
 
 import com.android.build.gradle.api.LibraryVariant
-import io.github.g00fy2.versioncompare.Version
 import com.tonicsystems.jarjar.Rule
+import io.github.g00fy2.versioncompare.Version
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.ResolvedArtifact

diff --git a/src/main/groovy/co/ab180/fatjar/PathUtils.groovy b/src/main/groovy/co/ab180/fatjar/PathUtils.groovy
@@ -18,7 +18,9 @@ class PathUtils {
     }
 
     static String buildBundleLibRuntimeTaskPath(LibraryVariant variant, Version gradleToolVersion) {
-        if (gradleToolVersion.isAtLeast("4.0.0")) {
+        if (gradleToolVersion.isAtLeast("4.2.0")) {
+            return "bundleLibRuntimeToDir${variant.name.capitalize()}"
+        } else if (gradleToolVersion.isAtLeast("4.0.0")) {
             return "bundleLibRuntimeToJar${variant.name.capitalize()}"
         } else {
             return "bundleLibRuntime${variant.name.capitalize()}"

diff --git a/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy b/src/main/groovy/co/ab180/fatjar/TaskUtils.groovy
@@ -1,15 +1,13 @@
 package co.ab180.fatjar
 
 import com.android.build.gradle.api.LibraryVariant
-import io.github.g00fy2.versioncompare.Version
 import com.tonicsystems.jarjar.MainProcessor
 import com.tonicsystems.jarjar.Rule
 import com.tonicsystems.jarjar.util.StandaloneJarProcessor
 import groovy.io.FileType
+import io.github.g00fy2.versioncompare.Version
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.file.FileTree
-import org.gradle.api.tasks.bundling.Zip
 
 import java.lang.ref.WeakReference