Update build.gradle

shiftrot · May 6, 2024 · 81a4a05 · 81a4a05
1 parent 530f2f0
commit 81a4a05
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ buildscript {
         'compileSdk'  : 34,
         'targetSdk'   : 28,
         'minSdk'      : 21,
-        // 'NDK'         : '21.4.7075529',
         'sourceCompatibility' : JavaVersion.VERSION_1_8,
         'targetCompatibility' : JavaVersion.VERSION_1_8,
         'jvmTarget' : "1.8"
@@ -23,15 +22,15 @@ buildscript {
         'annotation'       : '1.6.0',
         'appcompat'        : '1.6.1',
         'constraintlayout' : '2.1.4',
-        'core_ktx'         : '1.12.0',
+        'core_ktx'         : '1.13.1',
         'documentfile'     : '1.0.1',
         'drawerlayout'     : '1.2.0',
-        'fragment_ktx'     : '1.6.2',
-        'kotlin'           : '1.9.0',
-        'material'         : '1.10.0',
+        'fragment_ktx'     : '1.7.0',
+        'kotlin'           : '1.9.20',
+        'material'         : '1.12.0',
         'preference'       : '1.2.1',
-        'vectordrawable'   : '1.1.0',
-        'webkit'           : '1.9.0',
+        'vectordrawable'   : '1.2.0',
+        'webkit'           : '1.11.0',
         'kotlin_coroutines': '1.4.1',
         'kotlin_coroutines_core': '1.3.7',
     ]
@@ -42,7 +41,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
     }
 }
@@ -72,5 +71,5 @@ subprojects {
 }
 
 tasks.register('clean') {
-    delete rootProject.buildDir
+    delete File.getBuildDir()
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,6 +18,5 @@ android.enableJetifier=false
 android.debug.obsoleteApi=true
 org.gradle.unsafe.configuration-cache=true
 org.gradle.warning.mode=all
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Feb 17 08:49:16 JST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/libtermexec/build.gradle b/libtermexec/build.gradle
@@ -19,7 +19,6 @@ android {
     }
 
     externalNativeBuild {
-        ndkVersion versions.NDK
         ndkBuild {
             path 'src/main/jni/Android.mk'
         }

diff --git a/term/build.gradle b/term/build.gradle
@@ -22,7 +22,6 @@ android {
 
     defaultConfig {
         externalNativeBuild {
-            ndkVersion versions.NDK
             ndkBuild {
                 arguments '-C', 'src/main', '-j', Runtime.runtime.availableProcessors() + ''
                 if (abiArm) abiFilters 'arm64-v8a', 'armeabi-v7a'
@@ -56,6 +55,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     buildTypes {
@@ -135,7 +135,7 @@ dependencies {
 
 dependencies {
     implementation 'org.apache.commons:commons-compress:1.21'
-    implementation 'commons-io:commons-io:2.6'
+    implementation 'commons-io:commons-io:2.13.0'
     implementation 'org.tukaani:xz:1.8'
 }