From 0964a8eecee68e6fce12d54cae633b7853fed25c Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Sat, 28 Jan 2023 11:54:06 +0800 Subject: [PATCH] Update core to 1.8.6 (#168) With - update AGP to 7.4.0 - update Android Build Tools to 33.0.1 --- build.gradle.kts | 30 ++++++++++++++--------- core | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- manager/build.gradle.kts | 1 + manager/src/main/AndroidManifest.xml | 3 +-- meta-loader/build.gradle.kts | 1 + meta-loader/src/main/AndroidManifest.xml | 2 +- patch-loader/build.gradle.kts | 1 + patch-loader/src/main/AndroidManifest.xml | 2 +- 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 35fe66a..cdcdc7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,7 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension import com.android.build.gradle.BaseExtension import org.eclipse.jgit.api.Git import org.eclipse.jgit.internal.storage.file.FileRepository +import org.eclipse.jgit.storage.file.FileRepositoryBuilder plugins { id("com.android.application") apply false @@ -26,28 +27,33 @@ val commitCount = run { Git(repo).log().add(refId).call().count() } -val coreCommitCount = run { - val repo = FileRepository(rootProject.file(".git/modules/core")) - val refId = repo.refDatabase.exactRef("HEAD").objectId!! - Git(repo).log().add(refId).call().count() -} +val (coreCommitCount, coreLatestTag) = FileRepositoryBuilder().setGitDir(rootProject.file(".git/modules/core")) + .runCatching { + build().use { repo -> + val git = Git(repo) + val coreCommitCount = + git.log() + .add(repo.refDatabase.exactRef("refs/remotes/origin/master").objectId) + .call().count() + 4200 + val ver = git.describe() + .setTags(true) + .setAbbrev(0).call().removePrefix("v") + coreCommitCount to ver + } + }.getOrNull() ?: (1 to "1.0") // sync from https://github.com/LSPosed/LSPosed/blob/master/build.gradle.kts val defaultManagerPackageName by extra("org.lsposed.lspatch") val apiCode by extra(93) val verCode by extra(commitCount) val verName by extra("0.5.1") -val coreVerCode by extra(coreCommitCount + 4200) -val coreVerName by extra( - file("$rootDir/core/build.gradle.kts").readLines() - .find { it.startsWith("val verName by extra") }!! - .split('"')[1] -) +val coreVerCode by extra(coreCommitCount) +val coreVerName by extra(coreLatestTag) val androidMinSdkVersion by extra(28) val androidTargetSdkVersion by extra(33) val androidCompileSdkVersion by extra(33) val androidCompileNdkVersion by extra("25.1.8937393") -val androidBuildToolsVersion by extra("32.0.0") +val androidBuildToolsVersion by extra("33.0.1") val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidTargetCompatibility by extra(JavaVersion.VERSION_11) diff --git a/core b/core index 8f3684a..5666dca 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8f3684a9cb1874f961ec7729ffd2f81d62fb16c7 +Subproject commit 5666dca1e3b83e9b664bfcd096370b1a7da6eff1 diff --git a/gradle.properties b/gradle.properties index e6af2ae..07cc98f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ android.nonTransitiveRClass=true android.enableR8.fullMode=true android.useAndroidX=true -agpVersion=7.3.1 +agpVersion=7.4.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts index f309073..2b573c5 100644 --- a/manager/build.gradle.kts +++ b/manager/build.gradle.kts @@ -46,6 +46,7 @@ android { } sourceSets["main"].assets.srcDirs(rootProject.projectDir.resolve("out/assets")) + namespace = "org.lsposed.lspatch" applicationVariants.all { kotlin.sourceSets { diff --git a/manager/src/main/AndroidManifest.xml b/manager/src/main/AndroidManifest.xml index 9ff9eba..a95bf0b 100644 --- a/manager/src/main/AndroidManifest.xml +++ b/manager/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/meta-loader/src/main/AndroidManifest.xml b/meta-loader/src/main/AndroidManifest.xml index c00f1ef..8072ee0 100644 --- a/meta-loader/src/main/AndroidManifest.xml +++ b/meta-loader/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/patch-loader/build.gradle.kts b/patch-loader/build.gradle.kts index 577a86a..1a65636 100644 --- a/patch-loader/build.gradle.kts +++ b/patch-loader/build.gradle.kts @@ -19,6 +19,7 @@ android { path("src/main/jni/CMakeLists.txt") } } + namespace = "org.lsposed.lspatch.loader" } androidComponents.onVariants { variant -> diff --git a/patch-loader/src/main/AndroidManifest.xml b/patch-loader/src/main/AndroidManifest.xml index a1f5f27..8072ee0 100644 --- a/patch-loader/src/main/AndroidManifest.xml +++ b/patch-loader/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - +