From 83636614226a1bfce5264d36ff3536e2663af53a Mon Sep 17 00:00:00 2001 From: neubauerm Date: Tue, 28 May 2024 16:27:47 +0200 Subject: [PATCH] refactor: update libs + VERSION 2.2.14 --- app/build.gradle | 31 +- app/src/main/AndroidManifest.xml | 5 +- app/src/main/res/layout/activity_main.xml | 890 +++++++++--------- build.gradle | 21 +- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.properties | 3 +- kotlinlog/build.gradle | 46 +- .../quanti/com/kotlinlog/utils/FileUtils.kt | 14 +- 8 files changed, 521 insertions(+), 492 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6c3ee18..55d091f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,15 +4,19 @@ apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + namespace "quanti.com.kotlinlog3" + + compileSdk 34 + defaultConfig { applicationId "quanti.com.kotlinlog3" - minSdkVersion 16 - targetSdkVersion 33 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false @@ -23,28 +27,41 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + ndkVersion '21.3.6528147' + kotlinOptions { + jvmTarget = "17" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + // library - select one - either local or maven // implementation 'com.github.Qase:KotlinLogger:18c33991fd' implementation project(':kotlinlog') // RxJava - implementation 'io.reactivex.rxjava2:rxjava:2.2.8' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - testImplementation 'junit:junit:4.12' + + // Test + testImplementation 'junit:junit:4.13.2' androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support.constraint:constraint-layout:1.1.3' } + repositories { mavenCentral() } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 233b69b..ab45d1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,8 @@ - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + +