Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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/"))
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ android {
}
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
Expand All @@ -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")
Expand All @@ -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")
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Expand All @@ -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))
}
Expand Down
13 changes: 13 additions & 0 deletions publishing-plugins/src/main/kotlin/mvn-publish.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand All @@ -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")
}
}

Loading