Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

re-release 1.5.3 #14

Merged
merged 4 commits into from
Apr 14, 2023
+5 −7
Merged

re-release 1.5.3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6344b
prepare release 1.5.3
wenxi-zeng Apr 14, 2023
959485e
fix when else branch missing
wenxi-zeng Apr 14, 2023
9d39a55
fix gradle failure caused by lib versions
wenxi-zeng Apr 14, 2023
0df0b98
prepare snapshot 1.5.4
wenxi-zeng Apr 14, 2023
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
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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")
}
}
Expand Down
5 changes: 1 addition & 4 deletions lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ val VERSION_NAME: String by project

android {
compileSdk = 33
buildToolsVersion = "31.0.0"

defaultConfig {
multiDexEnabled = true
Expand Down Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions lib/src/main/java/com/segment/analytics/kotlin/destinations/amplitude/AmplitudeSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class AmplitudeSession (sessionTimeoutMs : Long = 300000) : Plugin, VersionedPlu
is AliasEvent -> {
result = alias(result)
}
else -> {}
}
return result
}
Expand Down