merge42

Last Commit Merged: https://github.com/tachiyomiorg/tachiyomi/commit/97e6f1ea9a4b31d9b2cee0ffc4f032f3ba6d6bc7

.github/workflows/build_pull_request.yml

@@ -28,10 +28,10 @@ jobs:
  - name: Dependency Review
  uses: actions/dependency-review-action@v3
 
- - name: Set up JDK 11
+ - name: Set up JDK
  uses: actions/setup-java@v3
  with:
- java-version: 11
+ java-version: 17
  distribution: adopt
 
  - name: Build app and run unit tests

.github/workflows/build_push.yml

@@ -23,10 +23,10 @@ jobs:
  - name: Validate Gradle Wrapper
  uses: gradle/wrapper-validation-action@v1
 
- - name: Set up JDK 11
+ - name: Set up JDK
  uses: actions/setup-java@v3
  with:
- java-version: 11
+ java-version: 17
  distribution: adopt
 
  - name: Build app and run unit tests

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
 
  defaultConfig {
  applicationId = "xyz.jmir.tachiyomi.mi"
- versionCode = 100
- versionName = "0.14.5"
+ versionCode = 101
+ versionName = "0.14.6"
 
  buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
  buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
@@ -102,7 +102,7 @@ android {
  }
  }
 
- packagingOptions {
+ packaging {
  resources.excludes.addAll(listOf(
  "META-INF/DEPENDENCIES",
  "LICENSE.txt",

app/proguard-android-optimize.txt

@@ -1,4 +1,5 @@
 -dontusemixedcaseclassnames
+-ignorewarnings
 -verbose
 
 -keepattributes *Annotation*

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 subprojects {
  tasks.withType<KotlinJvmCompile> {
  kotlinOptions {
- jvmTarget = JavaVersion.VERSION_1_8.toString()
+ jvmTarget = JavaVersion.VERSION_17.toString()
  }
  }
 
@@ -44,8 +44,8 @@ subprojects {
  }
 
  compileOptions {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
  isCoreLibraryDesugaringEnabled = true
  }
 

gradle.properties

@@ -20,7 +20,9 @@ org.gradle.parallel=true
 
 org.gradle.caching=true
 
-# AndroidX support
-android.useAndroidX=true
-
 kotlin.mpp.androidSourceSetLayoutVersion=2
+
+android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/androidx.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp_version = "7.4.2"
+agp_version = "8.0.0"
 lifecycle_version = "2.6.1"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,9 @@ if "$cygwin" || "$msys" ; then
  done
 fi
 
+ # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 # shell script including quotes and variable substitutions, so put them in