Skip to content

Commit

Permalink
chore(deps): bump to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
I-Info committed Dec 17, 2024
1 parent 0ea061f commit 9893f24
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 78 deletions.
54 changes: 22 additions & 32 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
id 'com.google.devtools.ksp'
id 'com.google.dagger.hilt.android'
id 'kotlin-kapt'
}

android {
Expand All @@ -22,9 +23,6 @@ android {
useSupportLibrary true
}

kapt {
includeCompileClasspath false
}
}

buildTypes {
Expand All @@ -42,8 +40,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
Expand All @@ -53,9 +51,7 @@ android {
viewBinding true
buildConfig true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.3'
}

packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand All @@ -65,56 +61,50 @@ android {

dependencies {
// Androidx Core & UI
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-animation:1.0.0-rc01'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.core:core-animation:1.0.0'
implementation 'androidx.activity:activity-compose:1.9.3'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
implementation 'androidx.compose.material3:material3:1.1.2'
implementation 'androidx.compose.material:material-icons-extended:1.5.4'
implementation 'androidx.compose.material3:material3:1.3.1'
implementation 'androidx.compose.material:material-icons-extended:1.7.6'
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'androidx.navigation:navigation-compose:2.7.5'
implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
implementation 'com.google.android.material:material:1.10.0'
implementation "com.google.accompanist:accompanist-systemuicontroller:0.32.0"
implementation 'androidx.navigation:navigation-compose:2.8.5'
implementation 'androidx.profileinstaller:profileinstaller:1.4.1'
implementation 'com.google.android.material:material:1.12.0'
implementation 'com.google.accompanist:accompanist-systemuicontroller:0.36.0'

// For building AppWidgets with Glance
def glance_version = "1.0.0"
def glance_version = '1.1.1'
implementation "androidx.glance:glance-appwidget:$glance_version"
implementation "androidx.glance:glance-material3:$glance_version"

implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6'
implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8'

implementation project(":core:data")
implementation project(":core:common")

implementation "com.squareup.moshi:moshi:1.15.0"
implementation 'com.squareup.moshi:moshi:1.15.2'

// Work
implementation "androidx.work:work-runtime-ktx:$work_version"

// Dependency injection (Hilt)
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-navigation-compose:1.1.0'
ksp "com.google.dagger:hilt-compiler:$hilt_version"
implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'

testImplementation 'junit:junit:4.13.2'

androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"

debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
}

// Allow references to generated code
kapt {
correctErrorTypes true
}

18 changes: 9 additions & 9 deletions benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
Expand All @@ -37,13 +37,13 @@ android {
}

dependencies {
implementation 'androidx.test:core:1.5.0'
implementation "androidx.test:rules:1.5.0"
implementation "androidx.test:runner:1.5.2"
implementation 'androidx.test.ext:junit-ktx:1.1.5'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.2.0'
implementation "androidx.test.espresso:espresso-core:3.5.1"
implementation "androidx.test.uiautomator:uiautomator:2.2.0"
implementation 'androidx.test:core:1.6.1'
implementation 'androidx.test:rules:1.6.1'
implementation 'androidx.test:runner:1.6.2'
implementation 'androidx.test.ext:junit-ktx:1.2.1'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.3'
implementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
}

androidComponents {
Expand Down
29 changes: 15 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
buildscript {
ext {
target_sdk = 34
compile_sdk = 34
target_sdk = 35
compile_sdk = 35
min_sdk = 28

lifecycle_version = '2.6.2'
compose_version = '1.5.4'
hilt_version = '2.48.1'
retrofit_version = '2.9.0'
protobuf_version = '3.25.1'
room_version = '2.6.0'
work_version = '2.8.1'
lifecycle_version = '2.8.7'
compose_version = '1.7.6'
hilt_version = '2.53.1'
retrofit_version = '2.11.0'
protobuf_version = '4.29.1'
room_version = '2.6.1'
work_version = '2.10.0'
}
} // Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id 'com.android.application' version '8.2.0-rc01' apply false
id 'com.android.library' version '8.2.0-rc01' apply false
id 'com.android.test' version '8.2.0-rc01' apply false
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
id 'com.android.application' version '8.7.3' apply false
id 'com.android.library' version '8.7.3' apply false
id 'com.android.test' version '8.7.3' apply false
id 'org.jetbrains.kotlin.plugin.compose' version "2.1.0" apply false
id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
id 'com.google.devtools.ksp' version '2.1.0-1.0.29' apply false
id 'com.google.dagger.hilt.android' version "$hilt_version" apply false
id 'com.google.protobuf' version '0.9.4' apply false
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
Expand Down
4 changes: 2 additions & 2 deletions core/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}

Expand Down
8 changes: 4 additions & 4 deletions core/data/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'com.google.devtools.ksp'
id 'com.google.dagger.hilt.android'
id 'kotlin-kapt'
}

android {
Expand All @@ -14,8 +14,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}

Expand All @@ -29,5 +29,5 @@ dependencies {

// Dependency injection (Hilt)
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"
}
7 changes: 3 additions & 4 deletions core/database/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ plugins {
id 'org.jetbrains.kotlin.android'
id 'com.google.devtools.ksp'
id 'com.google.dagger.hilt.android'
id 'kotlin-kapt'
}

android {
Expand All @@ -15,8 +14,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}

Expand All @@ -36,5 +35,5 @@ dependencies {

// Dependency injection (Hilt)
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"
}
10 changes: 5 additions & 5 deletions core/datastore/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'com.google.devtools.ksp'
id 'com.google.dagger.hilt.android'
id 'kotlin-kapt'
id 'com.google.protobuf'
}

Expand All @@ -17,8 +17,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
}

Expand Down Expand Up @@ -46,10 +46,10 @@ protobuf {
dependencies {
implementation project(':core:common')

implementation "androidx.datastore:datastore:1.0.0"
implementation 'androidx.datastore:datastore:1.1.1'
implementation "com.google.protobuf:protobuf-kotlin-lite:$protobuf_version"

// Dependency injection (Hilt)
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"
}
11 changes: 5 additions & 6 deletions core/network/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ plugins {
id 'com.google.devtools.ksp'
id 'com.google.dagger.hilt.android'
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
id 'kotlin-kapt'
}

android {
Expand All @@ -27,8 +26,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
buildFeatures {
buildConfig true
Expand All @@ -51,13 +50,13 @@ dependencies {

implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
implementation "com.squareup.moshi:moshi:1.15.0"
ksp "com.squareup.moshi:moshi-kotlin-codegen:1.15.0"
implementation 'com.squareup.moshi:moshi:1.15.2'
ksp 'com.squareup.moshi:moshi-kotlin-codegen:1.15.2'

implementation "com.google.protobuf:protobuf-kotlin-lite:$protobuf_version"

implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
ksp "com.google.dagger:hilt-compiler:$hilt_version"

testImplementation 'junit:junit:4.13.2'
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Apr 28 16:00:17 CST 2023
#Tue Dec 17 20:16:34 CST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 9893f24

Please sign in to comment.