Skip to content

Commit ced1845

Browse files
committed
Update deps to use BOM and add Rokt
1 parent 5248f14 commit ced1845

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

core-sdk-samples/higgs-shop-sample-app/app/build.gradle.kts

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
88
// id("com.google.gms.google-services")
99
kotlin("android")
10-
kotlin("kapt")
10+
id("com.google.devtools.ksp")
1111
}
1212

1313
android {
@@ -26,101 +26,97 @@ android {
2626
}
2727
buildFeatures {
2828
buildConfig = true
29+
viewBinding = true
2930
dataBinding = true
3031
compose = true
3132
}
3233
composeOptions {
33-
kotlinCompilerExtensionVersion = "1.5.8"
34+
kotlinCompilerExtensionVersion = "1.5.15"
3435
}
3536
kotlinOptions {
36-
jvmTarget = "11"
37+
jvmTarget = "17"
3738
}
3839
buildTypes {
39-
getByName("release") {
40+
release {
4041
isMinifyEnabled = false
41-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
42+
proguardFiles(
43+
getDefaultProguardFile("proguard-android-optimize.txt"),
44+
"proguard-rules.pro"
45+
)
4246
}
43-
getByName("debug") {
47+
debug {
4448
isMinifyEnabled = false
4549
}
4650
}
4751
compileOptions {
48-
sourceCompatibility = JavaVersion.VERSION_11
49-
targetCompatibility = JavaVersion.VERSION_11
52+
sourceCompatibility = JavaVersion.VERSION_17
53+
targetCompatibility = JavaVersion.VERSION_17
5054
}
5155
}
5256

5357
dependencies {
54-
implementation("androidx.appcompat:appcompat:1.5.1")
55-
implementation("androidx.compose.runtime:runtime:1.5.4")
56-
implementation("androidx.compose.ui:ui:1.5.4")
57-
implementation("androidx.compose.material:material:1.5.4")
58-
implementation("androidx.compose.ui:ui-tooling:1.5.4")
59-
implementation("androidx.compose.runtime:runtime-livedata:1.5.4")
58+
// AndroidX BOM
59+
implementation(platform("androidx.compose:compose-bom:2024.01.00"))
60+
implementation("androidx.compose.runtime:runtime")
61+
implementation("androidx.compose.ui:ui")
62+
implementation("androidx.compose.material:material")
63+
debugImplementation("androidx.compose.ui:ui-tooling")
64+
implementation("androidx.compose.runtime:runtime-livedata")
65+
66+
// Core AndroidX dependencies
67+
implementation("androidx.core:core-ktx:1.12.0")
68+
implementation("androidx.appcompat:appcompat:1.6.1")
6069
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
61-
implementation("androidx.core:core-ktx:1.9.0")
62-
implementation("androidx.fragment:fragment:1.5.4")
63-
implementation("androidx.fragment:fragment-ktx:1.5.4")
64-
implementation("androidx.recyclerview:recyclerview:1.2.1")
65-
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
66-
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
67-
implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
68-
implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
69-
implementation("com.google.android.material:material:1.7.0")
70-
implementation("com.mparticle:android-core:5+")
71-
implementation("com.mparticle:android-kit-base:5+")
72-
implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
70+
implementation("androidx.fragment:fragment-ktx:1.6.2")
71+
implementation("androidx.recyclerview:recyclerview:1.3.2")
72+
73+
// Lifecycle
74+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
75+
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
76+
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
7377

74-
// implementation(platform("com.google.firebase:firebase-bom:31.0.2"))
75-
// implementation("com.google.firebase:firebase-analytics-ktx")
78+
// Navigation
79+
implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
80+
implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
7681

77-
// implementation("com.mparticle:android-media:1.4.2")
82+
// Room
83+
implementation("androidx.room:room-runtime:2.6.1")
84+
implementation("androidx.room:room-ktx:2.6.1")
85+
ksp("androidx.room:room-compiler:2.6.1")
7886

79-
implementation("com.github.bumptech.glide:glide:4.14.2")
87+
// Coroutines
88+
implementation(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
89+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android")
90+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
8091

81-
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.3")
82-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
83-
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
92+
// OkHttp
93+
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
94+
implementation("com.squareup.okhttp3:okhttp")
95+
implementation("com.squareup.okhttp3:logging-interceptor")
8496

97+
// Retrofit
8598
implementation("com.squareup.retrofit2:retrofit:2.9.0")
8699
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
87-
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
88-
implementation("com.squareup.retrofit2:adapter-rxjava2:2.9.0")
89-
implementation("io.reactivex.rxjava2:rxjava:2.2.21")
90-
implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
91-
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
92-
implementation("com.squareup.okhttp3:okhttp:4.10.0")
93-
implementation("com.squareup.okhttp3:logging-interceptor:4.10.0")
94100

95-
debugImplementation("androidx.compose.ui:ui-tooling:1.5.4")
101+
// mParticle
102+
implementation("com.mparticle:android-core:5+")
103+
implementation("com.mparticle:android-kit-base:5+")
104+
implementation("com.mparticle:android-rokt-kit:5+")
96105

97-
val roomVersion = "2.6.1"
98-
implementation("androidx.room:room-runtime:$roomVersion")
99-
// annotationProcessor("androidx.room:room-compiler:$roomVersion")
100-
kapt("androidx.room:room-compiler:$roomVersion")
101-
// ksp("androidx.room:room-compiler:$roomVersion")
102-
implementation("androidx.room:room-ktx:$roomVersion")
103-
implementation("androidx.room:room-rxjava2:$roomVersion")
104-
// implementation("androidx.room:room-rxjava3:$roomVersion")
105-
// implementation("androidx.room:room-guava:$roomVersion")
106-
// implementation("androidx.room:room-paging:2.4.1")
107-
testImplementation("androidx.room:room-testing:$roomVersion")
108-
testImplementation("junit:junit:4.13.2")
106+
// Google Services
107+
implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
109108

110-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.0")
111-
androidTestImplementation("androidx.test:core:1.4.0")
112-
androidTestImplementation("androidx.test:core-ktx:1.4.0")
113-
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
114-
androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0")
115-
androidTestImplementation("androidx.test:rules:1.4.0")
116-
androidTestImplementation("androidx.test.ext:junit:1.1.3")
117-
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.3")
118-
androidTestImplementation("androidx.test.ext:truth:1.4.0")
119-
androidTestImplementation("androidx.test:runner:1.4.0")
120-
androidTestImplementation("com.google.truth:truth:1.1.3")
121-
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
109+
// Other dependencies
110+
implementation("com.google.android.material:material:1.11.0")
111+
implementation("com.google.code.gson:gson:2.10.1")
112+
implementation("com.github.bumptech.glide:glide:4.16.0")
113+
ksp("com.github.bumptech.glide:compiler:4.16.0")
122114

123-
androidTestUtil("androidx.test:orchestrator:1.4.1")
115+
// Testing dependencies
116+
testImplementation("junit:junit:4.13.2")
117+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
118+
androidTestImplementation("androidx.test.ext:junit-ktx:1.1.5")
119+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
124120
}
125121

126122
fun buildVersionCode(): Int {

core-sdk-samples/higgs-shop-sample-app/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ buildscript {
77
}
88
dependencies {
99
classpath("com.android.tools.build:gradle:8.6.1")
10-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
10+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
1111
classpath("com.google.gms:google-services:4.3.14")
1212
}
1313
}
1414

15+
plugins {
16+
id("com.google.devtools.ksp") version "1.9.25-1.0.20" apply false
17+
}
18+
1519
tasks.register("clean", Delete::class) {
1620
delete(rootProject.buildDir)
1721
}

0 commit comments

Comments
 (0)