Skip to content

Commit

Permalink
Migrate to Kotlin 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
imbissbudenaesthetik committed Jul 15, 2024
1 parent f6e7970 commit 513c806
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
24 changes: 10 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ plugins {
id 'com.google.devtools.ksp'
id 'dagger.hilt.android.plugin'
id 'com.mikepenz.aboutlibraries.plugin'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.compose'
id 'org.jetbrains.kotlin.plugin.compose' version "$kotlin_version"
}

def apiPropertiesFile = rootProject.file("api.properties")
Expand Down Expand Up @@ -60,11 +61,6 @@ android {
jvmTarget = JavaVersion.VERSION_17.toString()
}

composeOptions {
kotlinCompilerExtensionVersion "1.5.14"
}


sourceSets {
// Adds exported schema location as test app assets.
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
Expand Down Expand Up @@ -105,16 +101,16 @@ dependencies {

implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "androidx.work:work-testing:$work_version"
implementation 'androidx.core:core-ktx:1.13.1'
debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.12'
debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'

implementation "com.google.dagger:hilt-android:$hilt_version"
implementation 'androidx.hilt:hilt-work:1.2.0'
implementation 'androidx.hilt:hilt-navigation-fragment:1.2.0'
implementation "com.google.dagger:hilt-android:$hilt_compiler_version"
implementation "androidx.hilt:hilt-work:$hilt_version"
implementation "androidx.hilt:hilt-navigation-fragment:$hilt_version"

implementation 'com.github.AppIntro:AppIntro:6.1.0'

Expand All @@ -129,8 +125,8 @@ dependencies {

implementation 'com.github.bumptech.glide:glide:4.16.0'

ksp "com.google.dagger:hilt-compiler:$hilt_version"
ksp 'androidx.hilt:hilt-compiler:1.2.0'
ksp "com.google.dagger:hilt-compiler:$hilt_compiler_version"
ksp "androidx.hilt:hilt-compiler:$hilt_version"

implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
Expand All @@ -139,7 +135,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation "androidx.room:room-testing:$room_version"
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0'
androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1'
androidTestImplementation 'androidx.test:core:1.6.1'
androidTestImplementation 'androidx.test:core-ktx:1.6.1'
androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
Expand Down
15 changes: 9 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.9.24'
ext.hilt_version = '2.51'
ext.kotlin_version = '2.0.0'
ext.hilt_compiler_version = '2.51.1'
ext.hilt_version = '1.2.0'
ext.room_version = '2.6.1'
ext.compose_version = '1.1.1'
ext.about_libraries_version = '11.1.0'
ext.compose_version = '1.6.10'
ext.about_libraries_version = '11.2.2'
ext.work_version = '2.8.1'
ext.ksp_version = '1.9.24-1.0.20'
ext.ksp_version = '2.0.0-1.0.23'

repositories {
google()
mavenCentral()
gradlePluginPortal()
maven {
url "https://plugins.gradle.org/m2/"
}
Expand All @@ -19,10 +21,11 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:8.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_compiler_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:$ksp_version"
classpath "org.jetbrains.compose:compose-gradle-plugin:$compose_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit 513c806

Please sign in to comment.