Skip to content

Commit

Permalink
# upgraded kotlin to 1.9.20, gradle to 8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sbra0902 committed Dec 11, 2023
1 parent be5e5ef commit 498ad61
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 38 deletions.
17 changes: 7 additions & 10 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ apply plugin: "com.google.devtools.ksp"
apply plugin: 'kotlin-allopen'

android {
lint {
checkReleaseBuilds false
abortOnError false
}

namespace 'kaufland.com.demo'
defaultConfig {
applicationId "kaufland.com.demo"
minSdkVersion 21
compileSdk = 31
targetSdkVersion 31
compileSdk = 33
targetSdkVersion 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -32,10 +36,6 @@ android {
viewBinding true
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
}

// workaround for "duplicate files during packaging of APK" issue:
packagingOptions {
exclude 'META-INF/ASL2.0'
Expand All @@ -56,10 +56,7 @@ allOpen {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
testImplementation 'junit:junit:4.12'
Expand Down
14 changes: 8 additions & 6 deletions demolibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@ apply plugin: "com.google.devtools.ksp"

android {

lint {
checkReleaseBuilds false
abortOnError false
}

namespace 'com.example.demolibrary'
defaultConfig {
minSdkVersion 21
targetSdkVersion 31
compileSdk = 31
targetSdkVersion 33
compileSdk = 33
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -40,13 +45,10 @@ kotlin {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.core:core-ktx:1.8.0'
implementation project(path: ':kokain-di')
implementation project(path: ':kokain-core-api')
ksp ksp(project(':kokain-ksp',))
testImplementation 'junit:junit:4.12'

androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}

This file was deleted.

0 comments on commit 498ad61

Please sign in to comment.