diff --git a/app/build.gradle b/app/build.gradle index 1071633d04..5f269a3b10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,15 @@ android { def splitAPKsForReleaseBuilds = System.getenv("TERMUX_SPLIT_APKS_FOR_RELEASE_BUILDS") ?: "0" // F-Droid does not support split APKs #1904 dependencies { - implementation "androidx.annotation:annotation:1.3.0" - implementation "androidx.core:core:1.6.0" + implementation "androidx.annotation:annotation:1.4.0" + implementation "androidx.core:core:1.8.0" implementation "androidx.drawerlayout:drawerlayout:1.1.1" + + // Do not increment androidx.preference version higher than 1.1.1 since it will break ViewUtils. implementation "androidx.preference:preference:1.1.1" - implementation "androidx.viewpager:viewpager:1.0.0" - implementation "com.google.android.material:material:1.4.0" - implementation "com.google.guava:guava:24.1-jre" + implementation "androidx.viewpager:viewpager:1.1.0-alpha01" + implementation "com.google.android.material:material:1.6.1" + implementation "com.google.guava:guava:31.1-jre" implementation "io.noties.markwon:core:$markwonVersion" implementation "io.noties.markwon:ext-strikethrough:$markwonVersion" implementation "io.noties.markwon:linkify:$markwonVersion" @@ -142,8 +144,10 @@ android { dependencies { testImplementation "junit:junit:4.13.2" - testImplementation "org.robolectric:robolectric:4.4" - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" + testImplementation "org.robolectric:robolectric:4.8.1" + + // Do not increment com.android.tools:desugar_jdk_libs version higher than 1.1.6 since it will fail Task :app:l8DexDesugarLibDebug while building the app. + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.6" } task versionName { @@ -214,11 +218,11 @@ task downloadBootstraps() { doLast { def packageVariant = project.ext.packageVariant if (packageVariant == "apt-android-7") { - def version = "2022.04.28-r5" + "+" + packageVariant - downloadBootstrap("aarch64", "4a51a7eb209fe82efc24d52e3cccc13165f27377290687cb82038cbd8e948430", version) - downloadBootstrap("arm", "6459a786acbae50d4c8a36fa1c3de6a4dd2d482572f6d54f73274709bd627325", version) - downloadBootstrap("i686", "919d212b2f19e08600938db4079e794e947365022dbfd50ac342c50fcedcd7be", version) - downloadBootstrap("x86_64", "61b02fdc03ea4f5d9da8d8cf018013fdc6659e6da6cbf44e9b24d1c623580b89", version) + def version = "2022.07.24-r1" + "+" + packageVariant + downloadBootstrap("aarch64", "eadbeefd113a7c6116339df21e419191fec6d7816e173238f3e10ead0b45c64a", version) + downloadBootstrap("arm", "436915427cab386a4c6917765dbe225d0ba0bb9fefee354724c1cacaec2d75e9", version) + downloadBootstrap("i686", "f33a45235917ad0e0c6dc44cd5593289ec1dc4278e9ba6f5d69e4a99e9792d49", version) + downloadBootstrap("x86_64", "dbf08cbdba479f900b2b00a89fc08ac16b12f89aa8cc6c707630f35d53a99d6c", version) } else if (packageVariant == "apt-android-5") { def version = "2022.04.28-r6" + "+" + packageVariant downloadBootstrap("aarch64", "913609d439415c828c5640be1b0561467e539cb1c7080662decaaca2fb4820e7", version) diff --git a/build.gradle b/build.gradle index 80ddd4bde1..ab5aa3c061 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" + classpath "com.android.tools.build:gradle:7.2.1" } } diff --git a/gradle.properties b/gradle.properties index fc751ab345..166f6087b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,8 @@ android.useAndroidX=true minSdkVersion=21 targetSdkVersion=28 -ndkVersion=22.1.7171670 -compileSdkVersion=30 +ndkVersion=25.0.8775105 +compileSdkVersion=31 markwonVersion=4.6.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0f7639f7d..2ec77e51a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle index afc57e9f7e..17f960ac4a 100644 --- a/terminal-emulator/build.gradle +++ b/terminal-emulator/build.gradle @@ -50,7 +50,7 @@ tasks.withType(Test) { } dependencies { - implementation "androidx.annotation:annotation:1.3.0" + implementation "androidx.annotation:annotation:1.4.0" testImplementation "junit:junit:4.13.2" } diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle index d603da2880..abcabed3b9 100644 --- a/terminal-view/build.gradle +++ b/terminal-view/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion project.properties.compileSdkVersion.toInteger() dependencies { - implementation "androidx.annotation:annotation:1.3.0" + implementation "androidx.annotation:annotation:1.4.0" api project(":terminal-emulator") } diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle index d44a8e4573..91a0b0ccf8 100644 --- a/termux-shared/build.gradle +++ b/termux-shared/build.gradle @@ -5,16 +5,16 @@ android { compileSdkVersion project.properties.compileSdkVersion.toInteger() dependencies { - implementation "androidx.appcompat:appcompat:1.3.1" - implementation "androidx.annotation:annotation:1.3.0" - implementation "androidx.core:core:1.6.0" - implementation "com.google.android.material:material:1.4.0" - implementation "com.google.guava:guava:24.1-jre" + implementation "androidx.appcompat:appcompat:1.4.2" + implementation "androidx.annotation:annotation:1.4.0" + implementation "androidx.core:core:1.8.0" + implementation "com.google.android.material:material:1.6.1" + implementation "com.google.guava:guava:31.1-jre" implementation "io.noties.markwon:core:$markwonVersion" implementation "io.noties.markwon:ext-strikethrough:$markwonVersion" implementation "io.noties.markwon:linkify:$markwonVersion" implementation "io.noties.markwon:recycler:$markwonVersion" - implementation "org.lsposed.hiddenapibypass:hiddenapibypass:2.0" + implementation "org.lsposed.hiddenapibypass:hiddenapibypass:4.3" // Do not increment version higher than 1.0.0-alpha09 since it will break ViewUtils and needs to be looked into // noinspection GradleDependency @@ -66,7 +66,7 @@ dependencies { testImplementation "junit:junit:4.13.2" androidTestImplementation "androidx.test.ext:junit:1.1.3" androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0" - coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.6" } task sourceJar(type: Jar) {