Merge pull request #34 from Qase/ref/update_libs

refactor: update libs + VERSION 2.2.14
Qase · May 29, 2024 · 40f3855 · 40f3855
2 parents 26fab36 + 8363661
commit 40f3855
Show file tree

Hide file tree

Showing 8 changed files with 521 additions and 492 deletions.
diff --git 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
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="quanti.com.kotlinlog3"
-          xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
 
     <application
         android:allowBackup="true"