Skip to content

Commit 72816a8

Browse files
AsemLabAsemLab
committed
Update to SDK 36, and update libraries
1 parent fde9682 commit 72816a8

6 files changed

Lines changed: 55 additions & 57 deletions

File tree

‎buildSrc/src/main/java/com/asemlab/samples/Configuration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.asemlab.samples
22

33
object Configuration {
4-
const val compileSdk = 34
5-
const val targetSdk = 34
4+
const val compileSdk = 36
5+
const val targetSdk = 36
66
const val minSdk = 22
77
const val majorVersion = 1
88
const val minorVersion = 0

‎gradle/libs.versions.toml‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
[versions]
2-
androidx-junit = "1.1.4"
2+
androidx-junit = "1.3.0"
33
# TODO Next two versions must be > 1.6.0
4-
appcompat = "1.6.1"
5-
androidx-activity = "1.7.2"
4+
appcompat = "1.7.1"
5+
androidx-activity = "1.10.1"
66
biometric = "1.1.0"
7-
constraintlayout = "2.1.4"
8-
core-ktx = "1.7.0"
7+
constraintlayout = "2.2.1"
8+
core-ktx = "1.17.0"
99
detektFormatting = "1.23.3"
10-
epoxyVer = "5.1.1"
11-
espresso-core = "3.5.0"
10+
epoxyVer = "5.1.4"
11+
espresso-core = "3.6.1"
1212
featureDeliveryKtx = "2.1.0"
1313
junit = "4.13.2"
14-
kaspresso = "1.5.5"
15-
leakcanary = "3.0-alpha-1"
16-
chucker = "4.0.0"
17-
logbackClassic = "1.2.3"
18-
material = "1.7.0"
19-
media3 = "1.4.1"
20-
mockk = "1.13.10"
14+
kaspresso = "1.6.0"
15+
leakcanary = "3.0-alpha-8"
16+
chucker = "4.2.0"
17+
logbackClassic = "1.5.18"
18+
material = "1.12.0"
19+
media3 = "1.8.0"
20+
mockk = "1.14.5"
2121
mpandroidchart = "3.1.0"
22-
navigation-ui-ktx = "2.5.3"
23-
navigation = "2.5.3"
24-
navigation-fragment-ktx = "2.5.3"
25-
android-application = "8.1.4"
26-
kotlin = "2.0.20"
27-
google-shortcuts = "1.0.0"
28-
okhttpBom = "4.10.0"
29-
playServicesAuth = "21.2.0"
30-
playServicesAuthApiPhone = "18.1.0"
31-
robolectric = "4.11.1"
32-
stripeAndroid = "20.42.0"
22+
navigation-ui-ktx = "2.9.3"
23+
navigation = "2.9.3"
24+
navigation-fragment-ktx = "2.9.3"
25+
android-application = "8.12.1"
26+
kotlin = "2.2.10"
27+
google-shortcuts = "1.1.0"
28+
okhttpBom = "5.1.0"
29+
playServicesAuth = "21.4.0"
30+
playServicesAuthApiPhone = "18.2.0"
31+
robolectric = "4.15.1"
32+
stripeAndroid = "21.23.1"
3333
timber = "5.0.1"
34-
viewpager = "1.0.0"
35-
koin_version = "3.5.3"
36-
room-runtime = "2.5.2"
37-
converter-gson = "2.9.0"
38-
gson = "2.10.1"
39-
retrofit = "2.9.0"
40-
ktor = "2.3.7"
41-
androidx-viewmodel = "2.6.2"
42-
kotlinx-serialization-json = "1.6.2"
34+
viewpager = "1.1.0"
35+
koin_version = "4.1.0"
36+
room-runtime = "2.7.2"
37+
converter-gson = "3.0.0"
38+
gson = "2.13.1"
39+
retrofit = "3.0.0"
40+
ktor = "3.2.3"
41+
androidx-viewmodel = "2.9.3"
42+
kotlinx-serialization-json = "1.9.0"
4343
glide = "4.16.0"
44-
hilt-android = "2.48"
45-
hilt-plugin= "2.48"
46-
realm="2.3.0"
44+
hilt-android = "2.57.1"
45+
hilt-plugin= "2.57.1"
46+
realm="3.0.0"
4747
legacy-support-v4 = "1.0.0"
48-
lifecycle-livedata-ktx = "2.7.0"
49-
google-services-plugin= "4.4.1"
50-
ktlint="12.1.0"
51-
detekt="1.23.3"
52-
activity = "1.8.0"
53-
kotlinx-coroutines-test= "1.7.3"
54-
uiautomator = "2.2.0"
55-
benchmarkMacroJunit4 = "1.2.0-beta01"
56-
apollo = "4.0.0"
57-
firebase-distribution = "16.0.0-beta13"
48+
lifecycle-livedata-ktx = "2.9.3"
49+
google-services-plugin= "4.4.3"
50+
ktlint="13.1.0"
51+
detekt="1.23.8"
52+
activity = "1.10.1"
53+
kotlinx-coroutines-test= "1.10.2"
54+
uiautomator = "2.3.0"
55+
benchmarkMacroJunit4 = "1.4.0"
56+
apollo = "4.3.3"
57+
firebase-distribution = "16.0.0-beta15"
5858
play-services-location = "21.3.0"
5959
datastore = "1.1.7"
6060
swiperefreshlayout = "1.1.0"
@@ -83,7 +83,6 @@ kaspresso = { module = "com.kaspersky.android-components:kaspresso", version.ref
8383
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
8484
chucker = { module = "com.github.chuckerteam.chucker:library", version.ref = "chucker" }
8585
chucker-no-op = { module = "com.github.chuckerteam.chucker:library-no-op", version.ref = "chucker" }
86-
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassic" }
8786
material = { module = "com.google.android.material:material", version.ref = "material" }
8887
google-shortcuts = { module = "androidx.core:core-google-shortcuts", version.ref = "google-shortcuts" }
8988
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
@@ -120,7 +119,6 @@ glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref =
120119
hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt-android" }
121120
hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt-android" }
122121
realm-base = { module = "io.realm.kotlin:library-base", version.ref = "realm" }
123-
realm-sync = { module = "io.realm.kotlin:library-sync", version.ref = "realm" }
124122
legacy-support-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacy-support-v4" }
125123
lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle-livedata-ktx" }
126124
activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Sat Oct 05 18:28:29 EET 2024
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎ktor/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,5 @@ dependencies {
6969
implementation(libs.ktor.serialization.gson)
7070
implementation(libs.ktor.negotiation)
7171
implementation(libs.ktor.logging)
72-
implementation(libs.logback.classic)
7372

7473
}

‎realm/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import com.asemlab.samples.Configuration
33
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
44
plugins {
55
alias(libs.plugins.android.application)
6+
// TODO IMPORTANT degrade kotlin to 2.0.20 to fix issues
67
alias(libs.plugins.kotlin)
78
alias(libs.plugins.kotlin.kapt)
89
alias(libs.plugins.hilt.plugin)
@@ -67,5 +68,4 @@ dependencies {
6768

6869
// TODO Add Realm dependencies
6970
implementation(libs.realm.base)
70-
implementation(libs.realm.sync)
7171
}

‎stripe/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ plugins {
1010

1111
}
1212
// TODO Add Your Stripe secret key and publishable key in local.properties file
13-
val publishable_key: String = gradleLocalProperties(rootDir).getProperty("STRIPE_PUBLISHABLE_KEY")
14-
val secret_key: String = gradleLocalProperties(rootDir).getProperty("SECRET_KEY")
15-
val customer_id: String = gradleLocalProperties(rootDir).getProperty("CUSTOMER_ID")
13+
val publishable_key: String =
14+
gradleLocalProperties(rootDir, providers).getProperty("STRIPE_PUBLISHABLE_KEY")
15+
val secret_key: String = gradleLocalProperties(rootDir, providers).getProperty("SECRET_KEY")
16+
val customer_id: String = gradleLocalProperties(rootDir, providers).getProperty("CUSTOMER_ID")
1617

1718
android {
1819
namespace = "com.asemlab.samples.stripe"

0 commit comments

Comments
 (0)