Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency updates (Kotlin 2.0 update) #335

Merged
merged 7 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
id 'org.jetbrains.kotlin.plugin.serialization'
id 'app.cash.paparazzi'
}

ext {
composeCompiler = "1.5.12"
}

android {
namespace 'io.github.lordraydenmk.superheroesapp'
compileSdk 34
Expand Down Expand Up @@ -40,10 +37,6 @@ android {
buildConfig true
}

composeOptions {
kotlinCompilerExtensionVersion project.ext.composeCompiler
}

sourceSets {
test.java.srcDirs += "src/testFixtures/kotlin"
test.java.srcDirs += "src/paparazzi/kotlin"
Expand Down Expand Up @@ -80,25 +73,21 @@ android {
dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"

// this helps renovate detect and update the compose compiler
//noinspection GroovyUnusedAssignment
def composeCompiler = "androidx.compose.compiler:compiler:${project.ext.composeCompiler}"

implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-compose:1.9.0'
def compose = "1.6.7"
def compose = "1.6.8"
implementation "androidx.compose.ui:ui:$compose"
implementation "androidx.compose.foundation:foundation:1.6.7"
implementation "androidx.compose.material:material:1.6.7"
implementation "androidx.compose.foundation:foundation:1.6.8"
implementation "androidx.compose.material:material:1.6.8"
implementation "androidx.compose.ui:ui-tooling:$compose"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
def lifecycle = "2.7.0"
def lifecycle = "2.8.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle"
implementation 'androidx.fragment:fragment-ktx:1.7.0'
implementation 'androidx.fragment:fragment-ktx:1.8.0'
def nav_version = "2.7.7"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
Expand Down
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kotlinVersion = "1.9.23"
kotlinVersion = "2.0.0"
}
}
plugins {
id 'com.android.application' version '8.4.0' apply false
id 'com.android.application' version '8.5.0' apply false
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "$kotlinVersion" apply false
id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" apply false
id 'app.cash.paparazzi' version '1.3.3' apply false
}
Expand All @@ -30,7 +31,3 @@ subprojects {
}
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ android.useAndroidX=true
android.enableJetifier=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# try the K2 compiler https://android-developers.googleblog.com/2023/07/try-k2-compiler-in-your-android-projects.html
kotlin.experimental.tryK2=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading