Dev: support Swift 5.7

readdle · Oct 19, 2023 · d3ca78b · d3ca78b
1 parent 8e96657
commit d3ca78b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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.3'
+    PUBLISH_VERSION = '1.4.4'
 }
 
 apply from: "${rootProject.projectDir}/publish-module.gradle"
diff --git a/src/main/groovy/com/readdle/android/swift/gradle/SwiftAndroidPlugin.groovy b/src/main/groovy/com/readdle/android/swift/gradle/SwiftAndroidPlugin.groovy
@@ -244,17 +244,17 @@ class SwiftAndroidPlugin implements Plugin<Project> {
                 : "src/main/swift/.build/${arch.swiftTriple}/release"
 
         def outputLibraries = project.fileTree(swiftPmBuildPath) {
-            include "*.so"
+            include "*.so", "*.so.*"
         }
 
         return project.task(type: Copy, "copySwift${taskQualifier}") {
             dependsOn(swiftBuildTask)
 
             from("src/main/swift/.build/jniLibs/${arch.androidAbi}") {
-                include "*.so"
+                include "*.so", "*.so.*"
             }
             from(toolchainHandle.getSwiftLibFolder(arch)) {
-                include "*.so"
+                include "*.so", "*.so.*"
             }
             from(outputLibraries)
 

diff --git a/src/main/groovy/com/readdle/android/swift/gradle/ToolchainHandle.groovy b/src/main/groovy/com/readdle/android/swift/gradle/ToolchainHandle.groovy
@@ -8,7 +8,7 @@ import org.gradle.api.Project
 
 class ToolchainHandle {
     public static final String FN_LOCAL_PROPERTIES = "local.properties"
-    public static final String TOOLS_VERSION = "1.9.7-swift5.4"
+    public static final String TOOLS_VERSION = "1.9.8-swift5.7"
     public static final String SWIFT_ANDROID_HOME_KEY = "swift-android.dir"
     public static final String ANDROID_NDK_HOME_KEY = "ndk.dir"