From 83a924378de9a45eb9d9069233dc2d96f36e1199 Mon Sep 17 00:00:00 2001 From: BinTianqi Date: Thu, 2 May 2024 14:50:29 +0800 Subject: [PATCH] use gradle signingConfigs to sign apk --- app/build.gradle.kts | 18 +++++++++++---- app/testkey.jks | Bin 0 -> 3050 bytes build.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- signature/signApk-testkey.bat | 2 -- signature/signApk-testkey.sh | 2 -- signature/testkey.pk8 | Bin 1217 -> 0 bytes signature/testkey.x509.pem | 27 ----------------------- 8 files changed, 16 insertions(+), 37 deletions(-) create mode 100644 app/testkey.jks delete mode 100644 signature/signApk-testkey.bat delete mode 100644 signature/signApk-testkey.sh delete mode 100644 signature/testkey.pk8 delete mode 100644 signature/testkey.x509.pem diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2345c53..7aaae9b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,6 +4,14 @@ plugins { } android { + signingConfigs { + create("testkey") { + storeFile = file("testkey.jks") + storePassword = "testkey" + keyPassword = "testkey" + keyAlias = "testkey" + } + } namespace = "com.bintianqi.owndroid" compileSdk = 34 @@ -13,6 +21,8 @@ android { targetSdk = 34 versionCode = 25 versionName = "5.0" + multiDexEnabled = false + //signingConfig = signingConfigs.getByName("testkey") } buildTypes { @@ -26,11 +36,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_20 + targetCompatibility = JavaVersion.VERSION_20 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "20" } buildFeatures { compose = true @@ -55,7 +65,7 @@ dependencies { implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-graphics") implementation("com.google.accompanist:accompanist-drawablepainter:0.35.0-alpha") - implementation("androidx.compose.material3:material3:1.2.0") + implementation("androidx.compose.material3:material3:1.2.1") implementation("androidx.navigation:navigation-compose:2.7.7") implementation("dev.rikka.shizuku:provider:13.1.5") implementation("dev.rikka.shizuku:api:13.1.5") diff --git a/app/testkey.jks b/app/testkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..d598d6a9eb1fafdbfdd9f17222c63a937e94ab5d GIT binary patch literal 3050 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 Ov%Bch^|iu3k^OI;9e7Rv literal 0 HcmV?d00001 diff --git a/build.gradle.kts b/build.gradle.kts index edfcfd3..075a54a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.3.2" apply false + id("com.android.application") version "8.4.0" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d8c9a8a..93fa1c1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jan 12 20:22:20 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/signature/signApk-testkey.bat b/signature/signApk-testkey.bat deleted file mode 100644 index 4ef8a78..0000000 --- a/signature/signApk-testkey.bat +++ /dev/null @@ -1,2 +0,0 @@ -apksigner sign --key testkey.pk8 --cert testkey.x509.pem ..\app\build\outputs\apk\release\app-release-unsigned.apk -ren ..\app\build\outputs\apk\release\app-release-unsigned.apk ..\app\build\outputs\apk\release\app-testkey.apk \ No newline at end of file diff --git a/signature/signApk-testkey.sh b/signature/signApk-testkey.sh deleted file mode 100644 index 933f18c..0000000 --- a/signature/signApk-testkey.sh +++ /dev/null @@ -1,2 +0,0 @@ -apksigner sign --key testkey.pk8 --cert testkey.x509.pem ../app/build/outputs/apk/release/app-release-unsigned.apk -mv ../app/build/outputs/apk/release/app-release-unsigned.apk ./app-release-testkey.apk diff --git a/signature/testkey.pk8 b/signature/testkey.pk8 deleted file mode 100644 index 586c1bd5cf96f9358f36b37ea98fef93f4d0a8e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1217 zcmV;y1U~yPf&{$+0RS)!1_>&LNQUrr!ay9qXGc{0)hbn0M?Tk1m4CA zB(d$sV&K`>B|bjQZ0jB3{|1bx=)9=SYtwjcrwXTR<_^0LnKfDe**XXo? z!`w>qP$CUb2nRCYfR`8UY6UY{=BAYFEVJ^2prmHVdX(5ZF$p?nH!d$^62NY4Lh)D_ z-~I!E%nZ~-+HBp!xFlE^NCC4YWD`%n-k8ZKcSzgyXKGXpfmF!5$_KgPM^!Ts#A}-O zZ{F<8j%nw}qR@_bCLokQnR0zR1pacF9hu*ot~j8w7k{H2TWbF49|8db0)hbn0FMm2 zSd@eZZOil8LF+r^ZYh5=o$?dxssvrd@O{PJN8(UP#IeNlLarW*N_QWU=dJbtwUa9MNB6mRRfiD@u-F4570O|hs88oP`H<{-WtCyW#0(F+HjcFBTNtPVs zqOAxo7-A$eO)H3r6sgRe?MH7gF5FJ$Tk3bck@E0NKQy`twmC#7`?TOyTgJ~$><(c= zegFe}?aLXyS&y+x7cyW?K{hgS`ZOu%e`OsJB7tT%e$vUP84FySkKHZd#R8E)%>sde z0Gxnk4`^q&#Rvr|X}T^DSmg_(X~iRQqj#>*`b>&xVy7{s?@%B>l*r?UT zWofQjN z+qr0%Y;#)55J7EtGjdx74aSIRNZLvuA3cfg=kcW}3-?Ohe|UTbd3%Dz{Ubm)=h@$h z^0YwLsa02~o`+_B=3mQ)WXwP_fX>WJrp<9hszYeD7Xa?hso~qjW(SiJU+Bp}E&;YH zGXjBtV=ArL8r`H~*_EbpVp|2xsYW66=~;8`kD4v(aiPJi8`ByM)}o1ZhZ|~p>uyzH zw4p3uqoir?dUseWHOKf>xwmY}&%k#`MgFNpFR|mPj0O9er&4Gc#l%UD4Z+(RrHVV$ f`+