gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-06 23:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade agp 8.0

Browse Source
This commit is contained in:
kunfei 2023-04-15 23:36:24 +08:00
parent ba98538971
commit c00a28c87e
7 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/build.gradle
View File

@ -17,11 +17,10 @@ def gitCommits = Integer.parseInt('git rev-list HEAD --count'.execute().text.tri
android { android {
compileSdk = compile_sdk_version compileSdk = compile_sdk_version
buildToolsVersion = build_tool_version
namespace 'io.legado.app' namespace 'io.legado.app'
kotlin { kotlin {
jvmToolchain { jvmToolchain {
languageVersion.set(JavaLanguageVersion.of("11")) languageVersion.set(JavaLanguageVersion.of(17))
} }
} }
@ -87,16 +86,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
flavorDimensions = ['mode']
android.applicationVariants.all { variant ->
variant.outputs.all {
def flavor = variant.productFlavors[0].name
outputFileName = "${name}_${flavor}_${defaultConfig.versionName}.apk"
}
}
flavorDimensions.add("mode")
productFlavors { productFlavors {
app { app {
dimension "mode" dimension "mode"
@ -114,14 +104,21 @@ android {
} }
} }
android.applicationVariants.all { variant ->
variant.outputs.all {
def flavor = variant.productFlavors[0].name
outputFileName = "${name}_${flavor}_${defaultConfig.versionName}.apk"
}
}
compileOptions { compileOptions {
// Flag to enable support for the new language APIs // Flag to enable support for the new language APIs
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
// Sets Java compatibility to Java 11 // Sets Java compatibility to Java 11
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
packagingOptions { packaging {
resources.excludes.add('META-INF/*') resources.excludes.add('META-INF/*')
} }
@ -231,7 +228,7 @@ dependencies {
implementation("org.nanohttpd:nanohttpd-websocket:$nanoHttpdVersion") implementation("org.nanohttpd:nanohttpd-websocket:$nanoHttpdVersion")
//二维码 //二维码
implementation('com.github.jenly1314:zxing-lite:2.3.1') implementation('com.github.jenly1314:zxing-lite:2.4.0')
//颜色选择 //颜色选择
implementation('com.jaredrummler:colorpicker:1.1.0') implementation('com.jaredrummler:colorpicker:1.1.0')

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
compile_sdk_version = 33 compile_sdk_version = 33
build_tool_version = '33.0.1' build_tool_version = '33.0.1'
kotlin_version = '1.8.0' kotlin_version = '1.8.0'
agp_version = '7.4.2' agp_version = '8.0.0'
exoplayer_version = '2.18.4' exoplayer_version = '2.18.4'
splitties_version = '3.0.0' splitties_version = '3.0.0'
room_version = '2.5.0' room_version = '2.5.0'

1
gradle.properties
View File

@ -40,3 +40,4 @@ android.nonTransitiveRClass=true
CronetVersion=112.0.5615.47 CronetVersion=112.0.5615.47
CronetMainVersion=112.0.0.0 CronetMainVersion=112.0.0.0
android.injected.testOnly=false android.injected.testOnly=false
android.nonFinalResIds=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Sep 26 08:03:55 CST 2022 #Mon Sep 26 08:03:55 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

10
modules/book/build.gradle
View File

@ -5,8 +5,12 @@ plugins {
android { android {
compileSdk = compile_sdk_version compileSdk = compile_sdk_version
buildToolsVersion = build_tool_version
namespace 'me.ag2s' namespace 'me.ag2s'
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 33 targetSdk 33
@ -16,8 +20,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
lint { lint {
checkDependencies true checkDependencies true

10
modules/rhino1.7.3/build.gradle
View File

@ -5,8 +5,12 @@ plugins {
android { android {
compileSdk = compile_sdk_version compileSdk = compile_sdk_version
buildToolsVersion = build_tool_version
namespace 'com.script' namespace 'com.script'
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
defaultConfig { defaultConfig {
minSdk 21 minSdk 21
targetSdk 33 targetSdk 33
@ -15,8 +19,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
lint { lint {
checkDependencies true checkDependencies true

10
modules/rhino1.7.4/build.gradle
View File

@ -5,8 +5,12 @@ plugins {
android { android {
compileSdk = compile_sdk_version compileSdk = compile_sdk_version
buildToolsVersion = build_tool_version
namespace 'com.script' namespace 'com.script'
kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
defaultConfig { defaultConfig {
minSdk 24 minSdk 24
targetSdk 33 targetSdk 33
@ -15,8 +19,8 @@ android {
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_17
} }
lint { lint {
checkDependencies true checkDependencies true