Skip to content

Commit 41124a9

Browse files
chore: update android dependancies (#239)
* chore: update android dependancies * chore: update pro-guard rules
1 parent 36c609c commit 41124a9

File tree

7 files changed

+60
-46
lines changed

7 files changed

+60
-46
lines changed

android-client-sdk/build.gradle

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id "com.vanniktech.maven.publish" version "0.30.0"
55
id 'de.mannodermaus.android-junit5'
66
}
7-
import com.vanniktech.maven.publish.SonatypeHost
87

8+
import com.vanniktech.maven.publish.SonatypeHost
99

1010
group = "com.devcycle"
1111
version = "2.3.2"
@@ -17,11 +17,11 @@ mavenPublishing {
1717
}
1818

1919
android {
20-
compileSdk 33
20+
compileSdk 35
2121

2222
defaultConfig {
2323
minSdk 23
24-
targetSdk 33
24+
targetSdk 35
2525

2626
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2727
testBuildType "minified"
@@ -92,29 +92,29 @@ ext {
9292
POM_DEVELOPER_NAME='DevCycle SDK Group'
9393
POM_DEVELOPER_URL='https://devcycle.com'
9494

95-
androidx_version = '1.8.0'
96-
retrofit_version = "2.9.0"
97-
swagger_annotations_version = '2.2.21'
98-
jackson_version = "2.13.5"
99-
jackson_kotlin_version = "2.13.5"
95+
androidx_version = '1.15.0'
96+
retrofit_version = "2.11.0"
97+
swagger_annotations_version = '2.2.26'
98+
jackson_version = "2.18.2"
99+
jackson_kotlin_version = "2.18.2"
100100
//noinspection DuplicatePlatformClasses
101-
jackson_jparser_version = "2.13.5"
101+
jackson_jparser_version = "2.18.2"
102102
gson_mapper_version = "2.8.6"
103-
coroutines_version = '1.6.2'
104-
kotlin_reflect_version = '1.9.0'
105-
106-
junit_version = "5.8.2"
107-
mockito_core_version = '4.6.1'
108-
mockito_inline_version = '2.13.0'
109-
mockk_version = '1.13.10'
110-
hamcrest_version = "2.2"
111-
okhttp_version = "4.9.3"
103+
coroutines_version = '1.10.1'
104+
kotlin_reflect_version = '2.1.20'
105+
106+
junit_version = "5.11.4"
107+
mockito_core_version = '5.14.2'
108+
mockito_inline_version = '5.2.0'
109+
mockk_version = '1.13.14'
110+
hamcrest_version = "3.0"
111+
okhttp_version = "4.12.0"
112112
okhttp_eventsource_version = "4.1.1"
113-
kotlin_version = '1.9.0'
113+
kotlin_version = '2.1.20'
114114

115115
android_core_version = "2.2.0"
116-
androidx_junit_version = "1.1.3"
117-
espresso_core_version = "3.4.0"
116+
androidx_junit_version = "1.2.1"
117+
espresso_core_version = "3.6.1"
118118
}
119119

120120
dependencies {
@@ -153,7 +153,7 @@ dependencies {
153153
testImplementation("com.squareup.okhttp3:mockwebserver:$okhttp_version")
154154
testImplementation("androidx.arch.core:core-testing:$android_core_version")
155155

156-
testImplementation("org.json:json:20190722")
156+
testImplementation("org.json:json:20240303")
157157

158158
androidTestImplementation("androidx.test.ext:junit:$androidx_junit_version")
159159
androidTestImplementation("androidx.test.espresso:espresso-core:$espresso_core_version")

android-client-sdk/proguard-rules.pro

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,27 @@
2222

2323
# TODO: Update all retrofit rules when retrofit 5 is released.
2424

25+
# Keep essential DevCycle SDK classes and their public APIs
2526
-keep class kotlin.Metadata { *; }
2627
-keep class com.devcycle.sdk.android.model.** { *; }
28+
-keep class com.devcycle.sdk.android.api.DevCycleClient { *; }
29+
-keep class com.devcycle.sdk.android.api.DevCycleClient$* { *; }
30+
-keep class com.devcycle.sdk.android.api.DevCycleOptions { *; }
31+
-keep class com.devcycle.sdk.android.api.** { *; }
32+
33+
# Keep utility classes needed for SDK functionality and testing
34+
-keep class com.devcycle.sdk.android.util.** { *; }
35+
36+
# Keep exception classes
37+
-keep class com.devcycle.sdk.android.exception.** { *; }
38+
39+
# Keep listener interfaces
40+
-keep class com.devcycle.sdk.android.listener.** { *; }
41+
42+
# Keep interceptor classes
43+
-keep class com.devcycle.sdk.android.interceptor.** { *; }
44+
45+
# Jackson and JSON processing
2746
-keep class java.beans.Transient.** {*;}
2847
-keep class java.beans.ConstructorProperties.** {*;}
2948
-keep class java.nio.file.Path.** {*;}
@@ -35,6 +54,7 @@
3554
-dontwarn retrofit2.KotlinExtensions
3655
-dontwarn retrofit2.KotlinExtensions$*
3756

57+
# OkHttp and networking
3858
-dontwarn org.bouncycastle.jsse.BCSSLParameters
3959
-dontwarn org.bouncycastle.jsse.BCSSLSocket
4060
-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
@@ -45,18 +65,13 @@
4565
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
4666
-dontwarn org.openjsse.net.ssl.OpenJSSE
4767

48-
# Ignore annotation used for build tooling.
49-
#-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
50-
68+
# Retrofit rules
5169
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
5270
-keep,allowobfuscation,allowshrinking class retrofit2.Response
5371
-keep,allowobfuscation,allowshrinking class okhttp3.RequestBody
5472
-keep,allowobfuscation,allowshrinking class okhttp3.ResponseBody
5573

56-
57-
# IMPORTANT: This ensures R8 Will not strip our JSONMapper and Coroutine classes
58-
-keep,allowobfuscation,allowshrinking class com.devcycle.sdk.android.**
59-
74+
# Keep coroutines
6075
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
6176

6277
# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
maven { url "https://plugins.gradle.org/m2/" }
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.0'
10-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
11-
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1"
9+
classpath 'com.android.tools.build:gradle:8.10.1'
10+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20'
11+
classpath "de.mannodermaus.gradle.plugins:android-junit5:1.11.2.0"
1212
}
1313
}
1414
task clean(type: Delete) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

java-example/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ plugins {
33
}
44

55
android {
6-
compileSdk 33
6+
compileSdk 35
77
namespace 'com.devcycle.javaexample'
88

99

1010
defaultConfig {
1111
applicationId "com.devcycle.javaexample"
1212
minSdk 23
13-
targetSdk 33
13+
targetSdk 35
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -39,11 +39,11 @@ android {
3939
}
4040

4141
dependencies {
42-
implementation 'androidx.appcompat:appcompat:1.4.1'
43-
implementation 'com.google.android.material:material:1.5.0'
42+
implementation 'androidx.appcompat:appcompat:1.7.0'
43+
implementation 'com.google.android.material:material:1.12.0'
4444
implementation(project(":android-client-sdk"))
4545
}
4646

47-
task wrapper(type: Wrapper){
48-
gradleVersion = '7.4'
47+
task wrapper(type: Wrapper) {
48+
gradleVersion = '8.11.1'
4949
}

kotlin-example/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ plugins {
44
}
55

66
android {
7-
compileSdk 33
7+
compileSdk 35
88
namespace 'com.devcycle.kotlinexample'
99

1010
defaultConfig {
1111
applicationId "com.devcycle.example"
1212
minSdk 23
13-
targetSdk 33
13+
targetSdk 35
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -45,12 +45,12 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation 'androidx.core:core-ktx:1.7.0'
49-
implementation 'androidx.appcompat:appcompat:1.4.1'
50-
implementation 'com.google.android.material:material:1.5.0'
48+
implementation 'androidx.core:core-ktx:1.15.0'
49+
implementation 'androidx.appcompat:appcompat:1.7.0'
50+
implementation 'com.google.android.material:material:1.12.0'
5151
implementation(project(":android-client-sdk"))
5252
}
5353

5454
task wrapper(type: Wrapper){
55-
gradleVersion = '7.4'
55+
gradleVersion = '8.11.1'
5656
}

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dependencyResolutionManagement {
33
repositories {
44
google()
55
mavenCentral()
6-
jcenter() // Warning: this repository is going to shut down soon
76
maven { url "https://jitpack.io" }
87
}
98
}

0 commit comments

Comments
 (0)