Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit e0d74bb

Browse files
dkhawkdkhawk
committed
Revert version catalog change
1 parent 370a50e commit e0d74bb

6 files changed

Lines changed: 76 additions & 135 deletions

File tree

‎solution/app/build.gradle.kts‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
alias(libs.plugins.android.application)
3-
alias(libs.plugins.kotlin.android)
2+
id("com.android.application")
3+
id("org.jetbrains.kotlin.android")
44
kotlin("kapt")
5-
alias(libs.plugins.hilt.android)
6-
alias(libs.plugins.secrets.gradle.plugin)
5+
id("com.google.dagger.hilt.android")
6+
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
77
}
88

99
android {
@@ -65,33 +65,40 @@ kapt {
6565

6666
dependencies {
6767

68-
implementation(libs.core.ktx.v1120)
69-
implementation(libs.lifecycle.runtime.ktx)
70-
implementation(libs.activity.compose)
71-
implementation(platform(libs.compose.bom))
72-
implementation(libs.foundation.android)
73-
implementation(libs.material3.android)
68+
implementation("androidx.core:core-ktx:1.12.0")
69+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
70+
implementation("androidx.activity:activity-compose:1.8.2")
71+
implementation(platform("androidx.compose:compose-bom:2024.03.00"))
72+
implementation("androidx.compose.ui:ui")
73+
implementation("androidx.compose.ui:ui-graphics")
74+
implementation("androidx.compose.ui:ui-tooling-preview")
75+
implementation("androidx.compose.material3:material3")
7476

75-
testImplementation(libs.junit)
76-
testImplementation(libs.robolectric)
77-
testImplementation(libs.core)
78-
testImplementation(libs.truth)
77+
testImplementation("junit:junit:4.13.2")
78+
testImplementation("org.robolectric:robolectric:4.11.1")
79+
testImplementation("androidx.test:core:1.5.0")
80+
testImplementation("com.google.truth:truth:1.4.2")
7981

80-
androidTestImplementation(libs.ext.junit)
81-
androidTestImplementation(libs.espresso.core)
82-
androidTestImplementation(platform(libs.compose.bom))
82+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
83+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
84+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.03.00"))
85+
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
86+
87+
debugImplementation("androidx.compose.ui:ui-tooling")
88+
debugImplementation("androidx.compose.ui:ui-test-manifest")
8389

8490
// Hilt
85-
implementation(libs.hilt.android)
86-
kapt(libs.hilt.android.compiler)
91+
val hiltVersion = "2.51"
92+
implementation("com.google.dagger:hilt-android:$hiltVersion")
93+
kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
8794
implementation(kotlin("reflect"))
8895

8996
// Google Maps Compose library
90-
implementation(libs.maps.compose)
97+
implementation("com.google.maps.android:maps-compose:4.3.3")
9198
// Google Maps Compose utility library
92-
implementation(libs.maps.compose.utils)
99+
implementation("com.google.maps.android:maps-compose-utils:4.3.3")
93100
// Google Maps Compose widgets library
94-
implementation(libs.maps.compose.widgets)
101+
implementation("com.google.maps.android:maps-compose-widgets:4.3.3")
95102
}
96103

97104
secrets {

‎solution/build.gradle.kts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
alias(libs.plugins.android.application) apply false
4-
alias(libs.plugins.kotlin.android) apply false
5-
alias(libs.plugins.hilt.android) apply false
3+
id("com.android.application") version "8.3.1" apply false
4+
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
5+
id("com.google.dagger.hilt.android") version "2.50" apply false
6+
}
7+
8+
buildscript {
9+
dependencies {
10+
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
11+
}
612
}

‎solution/gradle/libs.versions.toml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎starter/app/build.gradle.kts‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
alias(libs.plugins.android.application)
3-
alias(libs.plugins.kotlin.android)
2+
id("com.android.application")
3+
id("org.jetbrains.kotlin.android")
44
kotlin("kapt")
5-
alias(libs.plugins.hilt.android)
5+
id("com.google.dagger.hilt.android")
66
}
77

88
android {
@@ -64,32 +64,39 @@ kapt {
6464

6565
dependencies {
6666

67-
implementation(libs.core.ktx.v1120)
68-
implementation(libs.lifecycle.runtime.ktx)
69-
implementation(libs.activity.compose)
70-
implementation(platform(libs.compose.bom))
71-
implementation(libs.foundation.android)
72-
implementation(libs.material3.android)
67+
implementation("androidx.core:core-ktx:1.12.0")
68+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
69+
implementation("androidx.activity:activity-compose:1.8.2")
70+
implementation(platform("androidx.compose:compose-bom:2024.03.00"))
71+
implementation("androidx.compose.ui:ui")
72+
implementation("androidx.compose.ui:ui-graphics")
73+
implementation("androidx.compose.ui:ui-tooling-preview")
74+
implementation("androidx.compose.material3:material3")
7375

74-
testImplementation(libs.junit)
75-
testImplementation(libs.robolectric)
76-
testImplementation(libs.core)
77-
testImplementation(libs.truth)
76+
testImplementation("junit:junit:4.13.2")
77+
testImplementation("org.robolectric:robolectric:4.11.1")
78+
testImplementation("androidx.test:core:1.5.0")
79+
testImplementation("com.google.truth:truth:1.4.2")
7880

79-
androidTestImplementation(libs.ext.junit)
80-
androidTestImplementation(libs.espresso.core)
81-
androidTestImplementation(platform(libs.compose.bom))
81+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
82+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
83+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.03.00"))
84+
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
85+
86+
debugImplementation("androidx.compose.ui:ui-tooling")
87+
debugImplementation("androidx.compose.ui:ui-test-manifest")
8288

8389
// Hilt
84-
implementation(libs.hilt.android)
85-
kapt(libs.hilt.android.compiler)
90+
val hiltVersion = "2.51"
91+
implementation("com.google.dagger:hilt-android:$hiltVersion")
92+
kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
8693
implementation(kotlin("reflect"))
8794

8895
// Google Maps SDK -- these are here for the data model. Remove these dependencies and replace
8996
// with the compose versions.
90-
implementation(libs.play.services.maps)
97+
implementation("com.google.android.gms:play-services-maps:18.2.0")
9198
// KTX for the Maps SDK for Android library
92-
implementation(libs.maps.ktx)
99+
implementation("com.google.maps.android:maps-ktx:5.0.0")
93100
// KTX for the Maps SDK for Android Utility Library
94-
implementation(libs.maps.utils.ktx)
95-
}
101+
implementation("com.google.maps.android:maps-utils-ktx:5.0.0")
102+
}

‎starter/build.gradle.kts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
alias(libs.plugins.android.application) apply false
4-
alias(libs.plugins.kotlin.android) apply false
5-
alias(libs.plugins.hilt.android) apply false
3+
id("com.android.application") version "8.3.1" apply false
4+
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
5+
id("com.google.dagger.hilt.android") version "2.50" apply false
6+
}
7+
8+
buildscript {
9+
dependencies {
10+
11+
}
612
}

‎starter/gradle/libs.versions.toml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)