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.

Sign up for GitHub

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

Jump to bottom

Upgrade dependencies #23

Merged
merged 7 commits into from
Aug 28, 2023
Merged

Upgrade dependencies #23

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
147e4e3
Upgrade Kotlin to 1.9.0
ArnyminerZ Aug 28, 2023
20a40ae
Upgrade Compose Compiler to 1.5.2
ArnyminerZ Aug 28, 2023
0d53c43
Upgrade Compose BOM to 2023.08.00
ArnyminerZ Aug 28, 2023
2587a69
Removed unnecessary library
ArnyminerZ Aug 28, 2023
35779de
Upgrade AGP to 8.1.0
ArnyminerZ Aug 28, 2023
72b7057
Downgrade Dokka to 1.8.20
ArnyminerZ Aug 28, 2023
532d6a3
Merge branch 'main' into upgrade-dependencies
ArnyminerZ Aug 28, 2023
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
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.library") version "8.0.2" apply false
id("org.jetbrains.kotlin.android") version "1.8.21" apply false
id("org.jetbrains.dokka") version "1.8.10" apply false
id("com.android.library") version "8.1.0" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
id("org.jetbrains.dokka") version "1.9.0" apply false
}

group = "at.bitfire"
Expand Down
5 changes: 2 additions & 3 deletions lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.4.7"
kotlinCompilerExtensionVersion = "1.5.2"
}

lint {
Expand Down Expand Up @@ -74,15 +74,14 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib")

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.cardview:cardview:1.0.0")
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation("org.conscrypt:conscrypt-android:2.5.2")

// Jetpack Compose
val composeBom = platform("androidx.compose:compose-bom:2023.04.01")
val composeBom = platform("androidx.compose:compose-bom:2023.08.00")
implementation(composeBom)
androidTestImplementation(composeBom)
implementation("androidx.activity:activity-compose:1.7.2")
Expand Down
4 changes: 2 additions & 2 deletions sample-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.7' // keep in sync with Kotlin version in top-level build.gradle
kotlinCompilerExtensionVersion '1.5.2' // keep in sync with Kotlin version in top-level build.gradle
}
packagingOptions {
resources {
Expand All @@ -55,7 +55,7 @@ dependencies {
implementation 'com.google.android.material:material:1.9.0'

implementation 'androidx.activity:activity-compose:1.7.2'
implementation platform('androidx.compose:compose-bom:2023.06.01')
implementation platform('androidx.compose:compose-bom:2023.08.00')
implementation 'androidx.compose.material:material'
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
Expand Down
Loading