From 2f6344bc1f8e18f2aa089ca927148244fe4c07bf Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Fri, 14 Apr 2023 08:46:20 -0700 Subject: [PATCH 1/4] prepare release 1.5.3 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a8b570c..85b1e8e 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=154 -VERSION_NAME=1.5.4 +VERSION_CODE=153 +VERSION_NAME=1.5.3 POM_ARTIFACT_ID=amplitude POM_NAME=amplitude From 959485ebf01ff15361883683803b22f73dca5f0a Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Fri, 14 Apr 2023 09:51:41 -0700 Subject: [PATCH 2/4] fix when else branch missing --- .../analytics/kotlin/destinations/amplitude/AmplitudeSession.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt b/lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt index dbb18cf..3f8badf 100644 --- a/lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt +++ b/lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt @@ -62,6 +62,7 @@ class AmplitudeSession (sessionTimeoutMs : Long = 300000) : Plugin, VersionedPlu is AliasEvent -> { result = alias(result) } + else -> {} } return result } From 9d39a55c6f99704b6ca46a6542d0f0087c5a0270 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Fri, 14 Apr 2023 09:52:44 -0700 Subject: [PATCH 3/4] fix gradle failure caused by lib versions --- build.gradle.kts | 6 +++--- lib/build.gradle.kts | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 292ac0f..4b62ca6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ version = getVersionName() plugins { // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin. - id("org.jetbrains.kotlin.jvm") version "1.6.0" + id("org.jetbrains.kotlin.jvm") version "1.8.0" // Apply the java-library plugin for API and implementation separation. `java-library` @@ -22,8 +22,8 @@ buildscript { gradlePluginPortal() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.8.0") classpath("com.android.tools.build:gradle:7.0.4") } } diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 4d77ceb..4b7e8cc 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -10,7 +10,6 @@ val VERSION_NAME: String by project android { compileSdk = 33 - buildToolsVersion = "31.0.0" defaultConfig { multiDexEnabled = true @@ -45,9 +44,7 @@ dependencies { implementation("com.segment.analytics.kotlin:android:1.10.3") implementation("androidx.multidex:multidex:2.0.1") - implementation("androidx.core:core-ktx:1.9.0") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.8.0") + implementation("androidx.core:core-ktx:1.8.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.lifecycle:lifecycle-process:2.4.1") From 0df0b9840653ff87691c24bdde035deeb9e1e675 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Fri, 14 Apr 2023 10:11:45 -0700 Subject: [PATCH 4/4] prepare snapshot 1.5.4 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85b1e8e..a8b570c 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=153 -VERSION_NAME=1.5.3 +VERSION_CODE=154 +VERSION_NAME=1.5.4 POM_ARTIFACT_ID=amplitude POM_NAME=amplitude