Update appsfly version (#17)

* update library versions

* update sonatype to use the staging api

* update version

* update gha cache version

* update ubuntu version

* Revert "update ubuntu version"

This reverts commit 0832afd.

* fix ci issue

* fix ci issue

* remove desugaring

* replace foreach

* fix release issue

* fix release issue

* fix release issue

Author: wenxi-zeng

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: cache gradle dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: cache gradle dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

.github/workflows/snapshot.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: cache gradle dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

build.gradle.kts

@@ -38,7 +38,11 @@ allprojects {
 
 nexusPublishing {
     repositories {
-        sonatype()
+        sonatype {
+            // New Portal OSSRH Staging API endpoints
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+        }
     }
 }
 

gradle.properties

@@ -23,8 +23,8 @@ kotlin.code.style=official
 # Deployment variables
 GROUP=com.segment.analytics.kotlin.destinations
 
-VERSION_CODE=161
-VERSION_NAME=1.6.1
+VERSION_CODE=170
+VERSION_NAME=1.7.0
 
 POM_ARTIFACT_ID=appsflyer
 POM_NAME=appsflyer

lib/build.gradle.kts

@@ -29,7 +29,6 @@ android {
         }
     }
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -39,7 +38,7 @@ android {
 }
 
 dependencies {
-    implementation("com.segment.analytics.kotlin:android:1.14.2")
+    implementation("com.segment.analytics.kotlin:android:1.22.0")
     implementation("androidx.multidex:multidex:2.0.1")
 
     implementation("androidx.core:core-ktx:1.8.0")
@@ -51,7 +50,7 @@ dependencies {
 
 // Partner Dependencies
 dependencies {
-    implementation("com.appsflyer:af-android-sdk:6.13.0")
+    implementation("com.appsflyer:af-android-sdk:6.17.4")
     implementation ("com.android.installreferrer:installreferrer:2.2")
 }
 

lib/src/main/java/com/segment/analytics/kotlin/destinations/appsflyer/AppsflyerDestination.kt

@@ -185,17 +185,17 @@ class AppsFlyerDestination(
                 is Number -> JsonPrimitive(value)
                 is String -> JsonPrimitive(value)
                 is Map<*, *> -> buildJsonObject {
-                    value.forEach { (k, v) ->
+                    for ((k, v) in value) {
                         put(k.toString(), convertToPrimitive(v))
                     }
                 }
                 is List<*> -> buildJsonArray {
-                    value.iterator().forEach { v ->
+                    for (v in value) {
                         add(convertToPrimitive(v))
                     }
                 }
                 is Array<*> -> buildJsonArray {
-                    value.forEach { v ->
+                    for (v in value) {
                         add(convertToPrimitive(v))
                     }
                 }
@@ -207,7 +207,7 @@ class AppsFlyerDestination(
             // See https://segment.com/docs/spec/mobile/#install-attributed.
             val properties = buildJsonObject {
                 put("provider", key)
-                attributionData.forEach { (k, v) ->
+                for ((k, v) in attributionData) {
                     if (k !in setOf("media_source", "adgroup")) {
                         put(k, convertToPrimitive(v))
                     }

publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts

@@ -122,6 +122,10 @@ tasks.getByName("publish") {
     dependsOn("build")
 }
 
+tasks.matching { it.name.startsWith("publish") && it.name.contains("Publication") }.configureEach {
+    mustRunAfter(tasks.matching { it.name.startsWith("sign") })
+}
+
 tasks.getByName("publishToMavenLocal") {
     dependsOn("build")
 }
@@ -130,3 +134,12 @@ tasks.getByName("publishToSonatype") {
     dependsOn("publish")
 }
 
+tasks.whenTaskAdded {
+    if (name.startsWith("publishTestPublicationTo")) {
+        dependsOn("bundleReleaseAar")
+    }
+    if (name.startsWith("sign") && name.contains("Publication")) {
+        mustRunAfter("bundleReleaseAar")
+    }
+}
+