From 498ad61fb7626939cde3f7cd49c6d96a86fc1835 Mon Sep 17 00:00:00 2001 From: Sven Braune Date: Mon, 11 Dec 2023 13:59:55 +0100 Subject: [PATCH] # upgraded kotlin to 1.9.20, gradle to 8.0 --- demo/build.gradle | 17 ++++++-------- demolibrary/build.gradle | 14 +++++++----- .../demolibrary/ExampleInstrumentedTest.kt | 22 ------------------- 3 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 demolibrary/src/androidTest/java/com/example/demolibrary/ExampleInstrumentedTest.kt diff --git a/demo/build.gradle b/demo/build.gradle index 404f967..e444b67 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -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" @@ -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' @@ -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' diff --git a/demolibrary/build.gradle b/demolibrary/build.gradle index 1aab978..b21ea13 100644 --- a/demolibrary/build.gradle +++ b/demolibrary/build.gradle @@ -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" @@ -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' } diff --git a/demolibrary/src/androidTest/java/com/example/demolibrary/ExampleInstrumentedTest.kt b/demolibrary/src/androidTest/java/com/example/demolibrary/ExampleInstrumentedTest.kt deleted file mode 100644 index e8cf2be..0000000 --- a/demolibrary/src/androidTest/java/com/example/demolibrary/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.demolibrary - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.assertEquals -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.example.demolibrary.test", appContext.packageName) - } -}