Updated to newer dependencies version

darshanparajuli · Mar 30, 2023 · 5649406 · 5649406
1 parent 62c8ae9
commit 5649406
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 50 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,24 +1,32 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+plugins {
+  id 'com.android.application'
+  id 'kotlin-android'
+  id 'kotlin-parcelize'
+  id 'kotlin-kapt'
+}
 
 def fileProvider = "file_provider"
 
 android {
-  compileSdkVersion 30
-  buildToolsVersion "30.0.3"
+  namespace "com.dp.logcatapp"
+
+  compileSdkVersion 33
+  buildToolsVersion "33.0.2"
 
   defaultConfig {
     applicationId "com.dp.logcatapp"
-    minSdkVersion 16
-    targetSdkVersion 30
+    minSdkVersion 21
+    targetSdkVersion 33
     versionCode 33
-    versionName "1.7.2"
+    versionName "1.7.3"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     vectorDrawables.useSupportLibrary = true
   }
 
+  buildFeatures {
+    viewBinding true
+  }
+
   signingConfigs {
     release {
       try {
@@ -34,22 +42,20 @@ android {
     }
   }
 
-  dexOptions {
-    javaMaxHeapSize "2g"
-  }
-
   lintOptions {
     abortOnError false
     disable 'MissingTranslation'
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8
+  kotlin {
+    jvmToolchain {
+      languageVersion.set(JavaLanguageVersion.of("11"))
+    }
   }
 
   buildTypes {
@@ -71,14 +77,13 @@ dependencies {
   implementation project(':collections')
   implementation project(':logcat')
   implementation project(':logger')
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
   implementation "androidx.core:core-ktx:$core_ktx_version"
   implementation "androidx.fragment:fragment-ktx:$fragment_ktx_version"
   implementation "androidx.appcompat:appcompat:$appcompat_version"
   implementation "com.google.android.material:material:$material_version"
   implementation "androidx.preference:preference-ktx:$preference_version"
-  implementation "androidx.legacy:legacy-preference-v14:$legacy_preference_v14_version"
   implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
   implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_ext"
   implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -87,6 +92,7 @@ dependencies {
   implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
   implementation "androidx.room:room-runtime:$room_version"
   implementation "androidx.documentfile:documentfile:$documentfile_version"
+  implementation "androidx.core:core-splashscreen:$splashscreen_version"
   kapt "androidx.room:room-compiler:$room_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_core_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_android_version"

diff --git a/build.gradle b/build.gradle
@@ -1,48 +1,58 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-  ext.kotlin_version = '1.4.31'
+  ext.kotlin_version = '1.8.10'
   repositories {
-    google()
     mavenCentral()
-    jcenter()
+    google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:7.4.2'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
 }
 
+plugins {
+  id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+}
+
 allprojects {
   repositories {
     google()
     mavenCentral()
-    jcenter()
+  }
+
+  gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+      options.encoding = 'UTF-8'
+      options.compilerArgs << "-Xlint:deprecation"
+    }
   }
 }
 
 ext {
-  appcompat_version = "1.2.0"
-  constraint_layout_version = "2.0.4"
-  core_ktx_version = "1.3.2"
+  appcompat_version = '1.6.1'
+  constraint_layout_version = '2.1.4'
+  core_ktx_version = '1.9.0'
   documentfile_version = "1.0.1"
-  fragment_ktx_version = "1.3.0"
-  kotlin_coroutines_android_version = "1.3.7"
-  kotlin_coroutines_core_version = "1.3.7"
+  fragment_ktx_version = "1.5.6"
+  kotlin_coroutines_android_version = '1.6.4'
+  kotlin_coroutines_core_version = "1.6.4"
   legacy_preference_v14_version = "1.0.0"
   lifecycle_ext = "2.2.0"
-  lifecycle_version = "2.3.0"
-  material_version = "1.3.0"
-  preference_version = "1.1.1"
-  room_version = "2.2.6"
+  lifecycle_version = "2.6.1"
+  material_version = "1.8.0"
+  preference_version = "1.2.0"
+  room_version = "2.5.1"
+  splashscreen_version = "1.0.0"
 
   // test dependencies
   junit_version = "4.13.2"
-  runner_version = "1.3.0"
-  espresso_core_version = "3.3.0"
+  runner_version = "1.5.2"
+  espresso_core_version = "3.5.1"
 }
 
 task clean(type: Delete) {

diff --git a/collections/build.gradle b/collections/build.gradle
@@ -1,32 +1,51 @@
-apply plugin: 'com.android.library'
-
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
+plugins {
+  id 'com.android.library'
+  id 'kotlin-android'
+  id 'kotlin-parcelize'
+}
 
 android {
-  compileSdkVersion 29
+  namespace "com.logcat.collections"
+
+  compileSdkVersion 33
 
   defaultConfig {
-    minSdkVersion 16
+    minSdkVersion 21
     versionCode 1
     versionName "1.0"
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
+  buildFeatures {
+    viewBinding true
+  }
+
   buildTypes {
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
+    buildTypes {
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlin {
+    jvmToolchain {
+      languageVersion.set(JavaLanguageVersion.of("11"))
+    }
   }
 }
 
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation project(':logger')
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
   implementation "androidx.appcompat:appcompat:$appcompat_version"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 12 19:28:10 PST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+#Mon Feb 27 21:39:02 CET 2023
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME