Update gradle, android gradle plugin and dependencies

termux · Oct 2, 2023 · e490087 · e490087
1 parent eef5ac4
commit e490087
Show file tree

Hide file tree

Showing 22 changed files with 247 additions and 170 deletions.
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
@@ -20,6 +20,12 @@ jobs:
  - name: Clone repository
  uses: actions/checkout@v3
 
+ - name: Setup java 17 as required by gradle
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
  - name: Build APKs
  shell: bash {0}
  env:

diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -16,6 +16,11 @@ jobs:
  steps:
  - name: Clone repository
  uses: actions/checkout@v3
+ - name: Setup java 17 as required by gradle
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: '17'
  - name: Execute tests
  run: |
  ./gradlew test
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,6 +13,8 @@ ext {
 }
 
 android {
+ namespace "com.termux"
+
  compileSdkVersion project.properties.compileSdkVersion.toInteger()
  ndkVersion = System.getenv("JITPACK_NDK_VERSION") ?: project.properties.ndkVersion
  def appVersionName = System.getenv("TERMUX_APP_VERSION_NAME") ?: ""
@@ -21,24 +23,24 @@ 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.drawerlayout:drawerlayout:1.1.1"
- implementation "androidx.preference:preference:1.1.1"
+ implementation "androidx.annotation:annotation:1.7.0"
+ implementation "androidx.core:core:1.12.0"
+ implementation "androidx.drawerlayout:drawerlayout:1.2.0"
+ implementation "androidx.preference:preference:1.2.1"
  implementation "androidx.viewpager:viewpager:1.0.0"
- implementation "com.google.android.material:material:1.4.0"
+ implementation "com.google.android.material:material:1.9.0"
  implementation "com.google.guava:guava:24.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 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
  implementation project(":terminal-view")
  implementation project(":termux-shared")
  }
 
  defaultConfig {
- applicationId "com.termux"
  minSdkVersion project.properties.minSdkVersion.toInteger()
  targetSdkVersion project.properties.targetSdkVersion.toInteger()
  versionCode 118
@@ -110,7 +112,7 @@ android {
  }
  }
 
- lintOptions {
+ lint {
  disable 'ProtectedPermissions'
  }
 
@@ -143,7 +145,7 @@ android {
 dependencies {
  testImplementation "junit:junit:4.13.2"
  testImplementation "org.robolectric:robolectric:4.10"
- coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
+ coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"
 }
 
 task versionName {
@@ -236,3 +238,8 @@ afterEvaluate {
  variant.javaCompileProvider.get().dependsOn(downloadBootstraps)
  }
 }
+
+// https://stackoverflow.com/questions/75274720/a-failure-occurred-while-executing-appcheckdebugduplicateclasses/
+configurations.implementation {
+ exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -10,8 +10,3 @@
 -dontobfuscate
 #-renamesourcefileattribute SourceFile
 #-keepattributes SourceFile,LineNumberTable
-
-# Temp fix for androidx.window:window:1.0.0-alpha09 imported by termux-shared
-# https://issuetracker.google.com/issues/189001730
-# https://android-review.googlesource.com/c/platform/frameworks/support/+/1757630
--keep class androidx.window.** { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
- package="com.termux"
  android:installLocation="internalOnly"
  android:sharedUserId="${TERMUX_PACKAGE_NAME}"
  android:sharedUserLabel="@string/shared_user_label">

diff --git a/app/src/main/java/com/termux/app/activities/HelpActivity.java b/app/src/main/java/com/termux/app/activities/HelpActivity.java
@@ -35,7 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
  mWebView = new WebView(this);
  WebSettings settings = mWebView.getSettings();
  settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
- settings.setAppCacheEnabled(false);
  setContentView(progressLayout);
  mWebView.clearCache(true);
 

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
@@ -271,7 +271,7 @@ private synchronized void loadBellSoundPool() {
  .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
 
  try {
- mBellSoundId = mBellSoundPool.load(mActivity, R.raw.bell, 1);
+ mBellSoundId = mBellSoundPool.load(mActivity, com.termux.shared.R.raw.bell, 1);
  } catch (Exception e){
  // Catch java.lang.RuntimeException: Unable to resume activity {com.termux/com.termux.app.TermuxActivity}: android.content.res.Resources$NotFoundException: File res/raw/bell.ogg from drawable resource ID
  Logger.logStackTraceWithMessage(LOG_TAG, "Failed to load bell sound pool", e);

diff --git a/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java b/app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
@@ -735,8 +735,8 @@ public void reportIssueFromTranscript() {
 
  MessageDialogUtils.showMessage(mActivity, TermuxConstants.TERMUX_APP_NAME + " Report Issue",
  mActivity.getString(R.string.msg_add_termux_debug_info),
- mActivity.getString(R.string.action_yes), (dialog, which) -> reportIssueFromTranscript(transcriptText, true),
- mActivity.getString(R.string.action_no), (dialog, which) -> reportIssueFromTranscript(transcriptText, false),
+ mActivity.getString(com.termux.shared.R.string.action_yes), (dialog, which) -> reportIssueFromTranscript(transcriptText, true),
+ mActivity.getString(com.termux.shared.R.string.action_no), (dialog, which) -> reportIssueFromTranscript(transcriptText, false),
  null);
  }
 

diff --git 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:8.1.2"
  }
 }
 
@@ -15,7 +15,3 @@ allprojects {
  maven { url "https://jitpack.io" }
  }
 }
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@ android.useAndroidX=true
 
 minSdkVersion=21
 targetSdkVersion=28
-ndkVersion=22.1.7171670
-compileSdkVersion=30
+ndkVersion=26.0.10792818
+compileSdkVersion=34
 
 markwonVersion=4.6.2
-
+android.defaults.buildfeatures.buildconfig=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 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-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists