Skip to content

Commit

Permalink
Upgraded Kotlin
Browse files Browse the repository at this point in the history
Signed-off-by: Arnau Mora <[email protected]>
  • Loading branch information
ArnyminerZ committed Aug 23, 2023
1 parent 27b72f6 commit 6c5b8e3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ apply plugin: 'com.mikepenz.aboutlibraries.plugin'
apply plugin: 'com.google.devtools.ksp'

android {
compileSdkVersion 33
buildToolsVersion '33.0.2'
compileSdk 33

namespace 'at.bitfire.icsdroid'

Expand Down Expand Up @@ -43,7 +42,7 @@ android {

composeOptions {
// Keep in sync with Kotlin version: https://developer.android.com/jetpack/androidx/releases/compose-kotlin
kotlinCompilerExtensionVersion = '1.4.7'
kotlinCompilerExtensionVersion = '1.5.1'
}

flavorDimensions "distribution"
Expand Down Expand Up @@ -88,7 +87,7 @@ android {
}

configurations {
all {
configureEach {
// exclude modules which are in conflict with system libraries
exclude module: "commons-logging"
exclude group: "org.json", module: "json"
Expand All @@ -99,7 +98,7 @@ configurations {
}

dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

implementation 'com.github.bitfireAT:cert4android:3817e62d9f173d8f8b800d24769f42cb205f560e'
Expand All @@ -109,7 +108,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.fragment:fragment-ktx:1.5.7'
implementation 'androidx.fragment:fragment-ktx:1.6.1'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ buildscript {
ext.versions = [
aboutLibs: '10.7.0',
composeBom: '2023.05.01', // https://developer.android.com/jetpack/compose/bom
kotlin: '1.8.21', // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
kotlin: '1.9.0', // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
ksp: '1.0.11',
okhttp: '5.0.0-alpha.11',
room: '2.5.1'
room: '2.5.2'
]

repositories {
Expand Down

0 comments on commit 6c5b8e3

Please sign in to comment.