Bump androidx.core:core-ktx from 1.13.1 to 1.15.0 (#489)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alejandro Rosas <[email protected]>
alejandrorosas · Oct 31, 2024 · f7db156 · f7db156
1 parent 6ede140
commit f7db156
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 52 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,43 +1,16 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.gradle)
-    alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.dagger.hilt)
-}
-
-repositories {
-    google()
-    mavenCentral()
+    id 'android-composable-conventions'
 }
 
 android {
     namespace 'dev.alejandrorosas.apptemplate'
-    compileSdk 34
 
     defaultConfig {
         applicationId "dev.alejandrorosas.apptemplate"
 
-        minSdk 26
-        targetSdk 34
-
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildFeatures {
-        compose true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     packagingOptions {
@@ -72,22 +45,7 @@ dependencies {
 
     implementation libs.kotlin
     implementation libs.appcompat
-    implementation libs.androidx.core
-    implementation libs.dagger
-    implementation libs.hilt
     implementation libs.androidx.hilt.navigation
-    implementation libs.androidx.hilt.navigation.compose
-
-    implementation libs.compose.ui
-    implementation libs.compose.navigation
-
-    ksp libs.dagger.compiler
-    ksp libs.hilt.compiler
-    ksp libs.androidx.hilt.compiler
-
-    testImplementation libs.junit
 
-    androidTestImplementation libs.androidx.test.junit
     androidTestImplementation libs.androidx.test.espresso
-    androidTestImplementation libs.compose.ui.test.junit
 }
diff --git a/build-conventions/src/main/groovy/android-app-conventions.gradle b/build-conventions/src/main/groovy/android-app-conventions.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id 'com.android.application'
+    id 'android-composable-conventions'
+}
diff --git a/build-conventions/src/main/groovy/android-composable-conventions.gradle b/build-conventions/src/main/groovy/android-composable-conventions.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "android-conventions"
-    id "org.jetbrains.kotlin.plugin.compose"
+    id 'android-conventions'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {

diff --git a/build-conventions/src/main/groovy/android-conventions.gradle b/build-conventions/src/main/groovy/android-conventions.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'kotlin-android'
-    id 'com.android.library'
     id 'com.google.devtools.ksp'
     id 'dagger.hilt.android.plugin'
 }
@@ -11,11 +10,11 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         minSdk 26
-        targetSdk 33
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/build-conventions/src/main/groovy/android-lib-composable-conventions.gradle b/build-conventions/src/main/groovy/android-lib-composable-conventions.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id 'com.android.library'
+    id 'android-composable-conventions'
+}
diff --git a/build-conventions/src/main/groovy/android-lib-conventions.gradle b/build-conventions/src/main/groovy/android-lib-conventions.gradle
@@ -0,0 +1,4 @@
+plugins {
+    id 'com.android.library'
+    id 'android-conventions'
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'android-composable-conventions'
+    id 'android-lib-composable-conventions'
 }
 
 android {

diff --git a/features/feature-template/build.gradle b/features/feature-template/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'android-composable-conventions'
+    id 'android-lib-composable-conventions'
 }
 
 android {

diff --git a/features/home/build.gradle b/features/home/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'android-composable-conventions'
+    id 'android-lib-composable-conventions'
 }
 
 android {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin"
 appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
-androidx-core = { module = "androidx.core:core-ktx", version = "1.13.1" }
+androidx-core = { module = "androidx.core:core-ktx", version = "1.15.0" }
 
 # Hilt
 hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }