Update Gradle & Kotlin & PlatformSDK

- Update Kotlin version to 1.7.0
- Update Gradle dependencies
- Merge legacy code
This commit is contained in:
2022-06-10 17:44:31 +08:00
parent e0e69869ab
commit 79ba9fe878
5 changed files with 22 additions and 20 deletions

View File

@@ -1,8 +1,8 @@
//file:noinspection unused //file:noinspection unused
plugins { plugins {
id 'com.android.application' version '7.2.0' apply false id 'com.android.application' version '7.2.1' apply false
id 'com.android.library' version '7.2.0' apply false id 'com.android.library' version '7.2.1' apply false
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
} }
ext { ext {

View File

@@ -15,12 +15,12 @@ android {
} }
} }
compileSdk 31 compileSdk 32
defaultConfig { defaultConfig {
applicationId "com.highcapable.yukihookapi.demo_app" applicationId "com.highcapable.yukihookapi.demo_app"
minSdk 22 minSdk 21
targetSdk 31 targetSdk 32
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@@ -47,9 +47,9 @@ android {
} }
dependencies { dependencies {
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.0' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.android'
id 'com.google.devtools.ksp' version '1.6.21-1.0.5' id 'com.google.devtools.ksp' version '1.7.0-1.0.6'
} }
android { android {
@@ -16,12 +16,12 @@ android {
} }
} }
compileSdk 31 compileSdk 32
defaultConfig { defaultConfig {
applicationId "com.highcapable.yukihookapi.demo_module" applicationId "com.highcapable.yukihookapi.demo_module"
minSdk 22 minSdk 21
targetSdk 31 targetSdk 32
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@@ -60,9 +60,9 @@ dependencies {
// Implementation Processor // Implementation Processor
ksp project(':yukihookapi-ksp-xposed') ksp project(':yukihookapi-ksp-xposed')
implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.0' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'

View File

@@ -6,7 +6,7 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-XX:+UseParallelGC
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -21,3 +21,5 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies, # resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library # thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true android.nonTransitiveRClass=true
# Incremental
kotlin.incremental.useClasspathSnapshot=true

View File

@@ -1,7 +1,7 @@
plugins { plugins {
id 'java-library' id 'java-library'
id 'org.jetbrains.kotlin.jvm' id 'org.jetbrains.kotlin.jvm'
id 'com.google.devtools.ksp' version '1.6.21-1.0.5' id 'com.google.devtools.ksp' version '1.7.0-1.0.6'
id 'maven-publish' id 'maven-publish'
id 'signing' id 'signing'
} }
@@ -28,7 +28,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
dependencies { dependencies {
implementation 'com.google.auto.service:auto-service-annotations:1.0.1' implementation 'com.google.auto.service:auto-service-annotations:1.0.1'
compileOnly 'com.google.devtools.ksp:symbol-processing-api:1.6.21-1.0.5' compileOnly 'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6'
ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.0.0' ksp 'dev.zacsweers.autoservice:auto-service-ksp:1.0.0'
} }