From 3217ff0d38ad028a266a0da1334bc97b5ea4a2e5 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:16:36 -0600 Subject: [PATCH 01/13] update library versions --- lib/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index fbd7932..e6198d8 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -39,7 +39,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 +51,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") } From 3202adfe7b1cc855c082856fafe68e15c26ba2d0 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:20:34 -0600 Subject: [PATCH 02/13] update sonatype to use the staging api --- build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4b62ca6..0fbf4ac 100644 --- a/build.gradle.kts +++ b/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/")) + } } } From 434c04db2d202c9bacd826293c0f5839b679f2b9 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:21:33 -0600 Subject: [PATCH 03/13] update version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7c8b994..7d26a5b 100644 --- a/gradle.properties +++ b/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 From 8dd6511966f4db5c5e51f32d929fe35a5470b555 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:26:34 -0600 Subject: [PATCH 04/13] update gha cache version --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0e06e3..b734f11 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23ec949..53096fa 100644 --- a/.github/workflows/release.yml +++ b/.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 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 9d3182c..8129a8e 100644 --- a/.github/workflows/snapshot.yml +++ b/.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 From 0832afd1fdd3d452dba58bc5ec3eb382b8bdeabe Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:32:08 -0600 Subject: [PATCH 05/13] update ubuntu version --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b734f11..3824937 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: cancel_previous: permissions: write-all - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: styfle/cancel-workflow-action@0.9.1 with: @@ -20,7 +20,7 @@ jobs: build: needs: cancel_previous - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53096fa..9949be0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: permissions: write-all - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 environment: deployment steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 8129a8e..aaaebfb 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -6,7 +6,7 @@ on: jobs: snapshot: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 environment: deployment steps: - uses: actions/checkout@v2 From 46dbf9cb9d218e191cd3e745452a863008f088c6 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 14:35:05 -0600 Subject: [PATCH 06/13] Revert "update ubuntu version" This reverts commit 0832afd1fdd3d452dba58bc5ec3eb382b8bdeabe. --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3824937..b734f11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: cancel_previous: permissions: write-all - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: styfle/cancel-workflow-action@0.9.1 with: @@ -20,7 +20,7 @@ jobs: build: needs: cancel_previous - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9949be0..53096fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: release: permissions: write-all - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest environment: deployment steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index aaaebfb..8129a8e 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -6,7 +6,7 @@ on: jobs: snapshot: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest environment: deployment steps: - uses: actions/checkout@v2 From 260b778ed5c7f759064cf7d3ea496a153f91fd34 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 15:22:06 -0600 Subject: [PATCH 07/13] fix ci issue --- publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts index 74fabf2..8183790 100644 --- a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts +++ b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts @@ -130,3 +130,7 @@ tasks.getByName("publishToSonatype") { dependsOn("publish") } +tasks.getByName("publishTestPublicationToSonatypeRepository") { + dependsOn("publish") +} + From 8f79fc23a2474a6cf666a34abb1a6fddf1a9cdbc Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 15:26:10 -0600 Subject: [PATCH 08/13] fix ci issue --- publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts index 8183790..dae9433 100644 --- a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts +++ b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts @@ -130,7 +130,9 @@ tasks.getByName("publishToSonatype") { dependsOn("publish") } -tasks.getByName("publishTestPublicationToSonatypeRepository") { - dependsOn("publish") +tasks.whenTaskAdded { + if (name.startsWith("publishTestPublicationTo")) { + dependsOn("bundleReleaseAar") + } } From 04a84eabb8d940cf4765fdabd752a239cbe1772e Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 15:31:37 -0600 Subject: [PATCH 09/13] remove desugaring --- lib/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index e6198d8..34c991c 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -29,7 +29,6 @@ android { } } compileOptions { - isCoreLibraryDesugaringEnabled = true sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } From e01a0d44e4334411ea1c979d757742890e14b9e1 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 15:49:30 -0600 Subject: [PATCH 10/13] replace foreach --- .../kotlin/destinations/appsflyer/AppsflyerDestination.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/com/segment/analytics/kotlin/destinations/appsflyer/AppsflyerDestination.kt b/lib/src/main/java/com/segment/analytics/kotlin/destinations/appsflyer/AppsflyerDestination.kt index a26c13a..fcfb62f 100644 --- a/lib/src/main/java/com/segment/analytics/kotlin/destinations/appsflyer/AppsflyerDestination.kt +++ b/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)) } From 4f37222672f488c147d8f1df05237258304d5579 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 15:59:58 -0600 Subject: [PATCH 11/13] fix release issue --- publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts index dae9433..6125874 100644 --- a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts +++ b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts @@ -132,7 +132,7 @@ tasks.getByName("publishToSonatype") { tasks.whenTaskAdded { if (name.startsWith("publishTestPublicationTo")) { - dependsOn("bundleReleaseAar") + dependsOn("publish") } } From b36f7ab54376a92ca2a63f7c90d7bed72641048b Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 16:08:06 -0600 Subject: [PATCH 12/13] fix release issue --- publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts index 6125874..b20bb82 100644 --- a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts +++ b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts @@ -132,7 +132,7 @@ tasks.getByName("publishToSonatype") { tasks.whenTaskAdded { if (name.startsWith("publishTestPublicationTo")) { - dependsOn("publish") + dependsOn("bundleReleaseAar", "signTestPublication") } } From 6ad8b12719adad402f44f7df39d79e3d997ed2a4 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Wed, 12 Nov 2025 16:17:30 -0600 Subject: [PATCH 13/13] fix release issue --- .../src/main/kotlin/mvn-publish.gradle.kts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts b/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts index b20bb82..327a641 100644 --- a/publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts +++ b/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") } @@ -132,7 +136,10 @@ tasks.getByName("publishToSonatype") { tasks.whenTaskAdded { if (name.startsWith("publishTestPublicationTo")) { - dependsOn("bundleReleaseAar", "signTestPublication") + dependsOn("bundleReleaseAar") + } + if (name.startsWith("sign") && name.contains("Publication")) { + mustRunAfter("bundleReleaseAar") } }