Downgrade AGP to stable version but use newer lint (#81)

* Downgrade AGP to stable version but use newer lint

* Downgrade Java to 17 and use newer r8
This commit is contained in:
FooIbar authored and GitHub committed 2023-10-24 13:08:23 +00:00
1 parent 1ab08d0ae1
commit 2e52dda208
7 files changed
+21 -6

No files matched your search

+2 -2
View File
@@ -18,11 +18,11 @@ jobs:
with:
submodules: 'recursive'
- name: Setup Java 21
- name: Setup Java 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 21
java-version: 17
- name: Install Rust Toolchain
run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android && rustup component add rustfmt clippy
+2 -2
View File
@@ -15,11 +15,11 @@ jobs:
with:
submodules: 'recursive'
- name: Setup Java 21
- name: Setup Java 17
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 21
java-version: 17
- name: Install Rust Toolchain
run: rustup update && rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
+1 -1
View File
@@ -276,7 +276,7 @@ dependencies {
}
kotlin {
jvmToolchain(21)
jvmToolchain(17)
}
ksp {
+10
View File
@@ -9,3 +9,13 @@ plugins {
alias(libs.plugins.rustAndroidPlugin) apply false
alias(libs.plugins.composeCompilerReportGenerator) apply false
}
tasks.register("Delete", Delete::class) {
delete(rootProject.layout.buildDirectory)
}
buildscript {
dependencies {
classpath(libs.r8)
}
}
+1
View File
@@ -21,5 +21,6 @@ org.gradle.caching=true
android.useAndroidX=true
android.enableAppCompileTimeRClass=true
android.experimental.enableNewResourceShrinker.preciseShrinking=true
android.experimental.lint.version=8.3.0-alpha09
android.lint.useK2Uast=true
kotlin.experimental.tryK2=true
+4 -1
View File
@@ -1,6 +1,7 @@
[versions]
aboutlibraries = "10.9.1"
agp = "8.3.0-alpha09"
agp = "8.1.2"
android-tools-r8 = "8.3.12-dev"
androidx-activity = "1.8.0"
androidx-appcompat = "1.6.1"
androidx-biometric = "1.2.0-alpha05"
@@ -121,6 +122,8 @@ okio-jvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
photoview = "com.github.chrisbanes:PhotoView:2.3.0"
r8 = { module = "com.android.tools:r8", version.ref = "android-tools-r8" }
rikkax-core = "dev.rikka.rikkax.core:core-ktx:1.4.1"
rikkax-insets = "dev.rikka.rikkax.insets:insets:1.3.0"
rikkax-layoutinflater = "dev.rikka.rikkax.layoutinflater:layoutinflater:1.3.0"
+1
View File
@@ -3,6 +3,7 @@ pluginManagement {
gradlePluginPortal()
google()
mavenCentral()
maven("https://storage.googleapis.com/r8-releases/raw")
}
}