Skip to content

Commit f7a106d

Browse files
authored
Upgrade kotlin, AGP, gradle versions and proguard-rules (signalfx#1176)
* Upgrade kotlin, AGP, gradle versions and proguard-rules * Adding back some removed -repackageClasses rule * Remove individual library minification and not needed proguard-rules * Add another proguard rule for auto value
1 parent 2620907 commit f7a106d

File tree

12 files changed

+27
-20
lines changed

12 files changed

+27
-20
lines changed

Diff for: app/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ apply<ConfigAndroidApp>()
1616
android {
1717
namespace = "com.splunk.app"
1818

19+
buildFeatures {
20+
buildConfig = true
21+
}
22+
1923
defaultConfig {
2024
applicationId = "com.splunk.app"
2125
versionCode = Configurations.sdkVersionCode
@@ -70,7 +74,6 @@ dependencies {
7074
implementation(project(":agent"))
7175
implementation(project(":integration:sessionreplay"))
7276
implementation(project(":integration:navigation"))
73-
implementation(project(":instrumentation:runtime:customtracking"))
7477

7578
implementation(Dependencies.SessionReplay.commonLogger)
7679
implementation(Dependencies.SessionReplay.commonUtils)

Diff for: app/proguard-rules.pro

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#compile-time annotation
2+
-dontwarn com.google.auto.value.AutoValue
3+
-dontwarn com.google.auto.value.AutoValue$Builder
4+
-dontwarn com.google.auto.value.AutoValue$CopyAnnotations
5+
-dontwarn com.google.auto.value.extension.memoized.Memoized
6+
7+
#compile-time dependency in io.opentelemetry.exporter
8+
-dontwarn com.fasterxml.jackson.core.JsonGenerator
9+
-dontwarn com.fasterxml.jackson.core.JsonFactory

Diff for: buildSrc/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ repositories {
99
}
1010

1111
dependencies {
12-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
13-
implementation("com.android.tools.build:gradle:7.4.0")
12+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
13+
implementation("com.android.tools.build:gradle:8.6.0")
1414
}

Diff for: buildSrc/src/main/kotlin/Configurations.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ object Configurations {
88
object Android {
99
const val appCompileVersion = 34
1010
const val compileVersion = 34
11-
const val minVersion = 21
12-
const val targetVersion = 31
11+
const val minVersion = 24
12+
const val targetVersion = 34
1313
}
1414

1515
object Compilation {

Diff for: buildSrc/src/main/kotlin/Dependencies.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ object Dependencies {
22

33
// Project level dependencies
44

5-
private const val gradleVersion = "7.4.0"
5+
private const val gradleVersion = "8.6.0"
66
private const val buildInfoExtractorGradleVersion = "4.25.5"
7-
private const val kotlinVersion = "1.7.20"
7+
private const val kotlinVersion = "1.8.0"
88
private const val ktlintVersion = "1.2.0"
99
private const val desugarVersion = "2.0.3"
1010
private const val bytebuddyVersion = "1.14.10"

Diff for: buildSrc/src/main/kotlin/plugins/ConfigAndroidLibrary.kt

+5-7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ class ConfigAndroidLibrary : Plugin<Project> by local plugin {
1010
apply<ConfigLint>()
1111

1212
android {
13+
14+
buildFeatures {
15+
buildConfig = true
16+
}
17+
1318
compileSdk = Configurations.Android.compileVersion
1419

1520
defaultConfig {
@@ -22,13 +27,6 @@ class ConfigAndroidLibrary : Plugin<Project> by local plugin {
2227
buildConfigField("String", "VERSION_CODE", "\"${Configurations.sdkVersionCode}\"")
2328
}
2429

25-
buildTypes {
26-
release {
27-
isMinifyEnabled = true
28-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
29-
}
30-
}
31-
3230
compileOptions {
3331
isCoreLibraryDesugaringEnabled = true
3432

Diff for: common/otel/src/main/java/com/splunk/sdk/common/otel/logRecord/UploadOtelLogRecordData.kt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ internal data class UploadOtelLogRecordData(val id: String, val jobIdStorage: Jo
2727

2828
override val jobNumberLimit: Long = 80L
2929

30-
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
3130
override fun createJobInfo(context: Context): JobInfo {
3231
return UploadOtelLogRecordDataJob.createJobInfoBuilder(context, jobIdStorage.getOrCreateId(id), id).build()
3332
}

Diff for: common/otel/src/main/java/com/splunk/sdk/common/otel/span/UploadOtelSpanData.kt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ internal data class UploadOtelSpanData(val id: String, val jobIdStorage: JobIdSt
2727

2828
override val jobNumberLimit: Long = 80L
2929

30-
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
3130
override fun createJobInfo(context: Context): JobInfo {
3231
return UploadOtelSpanDataJob.createJobInfoBuilder(context, jobIdStorage.getOrCreateId(id), id).build()
3332
}

Diff for: common/storage/proguard-rules.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-repackageclasses 'com.smartlook.sdk.common.storage'
1+
-repackageclasses 'com.splunk.sdk.common.storage'

Diff for: gradle.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
android.useAndroidX=true
22
org.gradle.caching=true
33
org.gradle.parallel=true
4-
org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8
5-
android.enableDexingArtifactTransform.desugaring=false
4+
org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

0 commit comments

Comments
 (0)