Dev: fix Gradle 7 support

readdle · Mar 7, 2022 · 5d32675 · 5d32675
1 parent 4017af7
commit 5d32675
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,9 +21,9 @@ repositories {
 }
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
-    compile "commons-configuration:commons-configuration:1.10"
+    implementation gradleApi()
+    implementation localGroovy()
+    implementation "commons-configuration:commons-configuration:1.10"
     compileOnly 'com.android.tools.build:gradle:4.1.0'
 }
 
@@ -36,7 +36,7 @@ ext {
     // Provide your own coordinates here
     PUBLISH_GROUP_ID = 'com.readdle.android.swift'
     PUBLISH_ARTIFACT_ID = 'gradle'
-    PUBLISH_VERSION = '1.4.0'
+    PUBLISH_VERSION = '1.4.1'
 }
 
 apply from: "${rootProject.projectDir}/publish-module.gradle"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Fri Aug 30 13:42:34 EEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

diff --git a/src/main/groovy/com/readdle/android/swift/gradle/SwiftAndroidPlugin.groovy b/src/main/groovy/com/readdle/android/swift/gradle/SwiftAndroidPlugin.groovy
@@ -8,6 +8,7 @@ import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.Exec
+import org.gradle.api.file.DuplicatesStrategy
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -246,12 +247,13 @@ class SwiftAndroidPlugin implements Plugin<Project> {
             into "src/main/jniLibs/${arch.androidAbi}"
 
             fileMode = 0644
+            duplicatesStrategy = DuplicatesStrategy.INCLUDE
         }
     }
 
     private static String taskQualifier(ApplicationVariant variant, Arch arch) {
         String archComponent = arch.variantName.capitalize()
-        String buildTypeComponent = variant.buildType.isJniDebuggable() ? "Debug" : "Release"
+        String buildTypeComponent = variant.buildType.name.capitalize()
         return archComponent + buildTypeComponent
     }