Merge pull request #429 from Goooler/master

Minor updates
ikarus23 · Aug 18, 2023 · 617aa63 · 617aa63
2 parents 2f61bb7 + cef1ccc
commit 617aa63
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/Mifare Classic Tool/app/build.gradle b/Mifare Classic Tool/app/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-    id 'com.android.application'
+    id 'com.android.application' version '8.1.0'
+    id 'org.jetbrains.kotlin.android' version '1.9.0'
 }
 
 android {
@@ -21,13 +22,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+}
 
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
-    }
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 }
 
 dependencies {
-    implementation "androidx.core:core:1.9.0"
-    implementation "androidx.preference:preference:1.2.0"
-}
+    implementation "androidx.core:core:1.10.1"
+    implementation "androidx.preference:preference:1.2.1"
+}
diff --git a/Mifare Classic Tool/build.gradle b/Mifare Classic Tool/build.gradle
diff --git a/Mifare Classic Tool/gradle.properties b/Mifare Classic Tool/gradle.properties
@@ -1,8 +1,4 @@
-android.defaults.buildfeatures.buildconfig=true
-android.enableJetifier=false
 android.injected.testOnly=false
-android.nonFinalResIds=false
-android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.caching=true
 org.gradle.configureondemand=true

diff --git a/Mifare Classic Tool/settings.gradle b/Mifare Classic Tool/settings.gradle
@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include ':app'