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 0000000..d598d6a Binary files /dev/null and b/app/testkey.jks differ 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 586c1bd..0000000 Binary files a/signature/testkey.pk8 and /dev/null differ diff --git a/signature/testkey.x509.pem b/signature/testkey.x509.pem deleted file mode 100644 index e242d83..0000000 --- a/signature/testkey.x509.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g -VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE -AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe -Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET -MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G -A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p -ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI -hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM -qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4 -wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy -4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU -RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s -zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw -HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ -AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE -CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH -QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG -CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud -EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa -J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y -LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe -+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX -31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr -sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0= ------END CERTIFICATE-----