diff --git a/.github/workflows/PR_check.yml b/.github/workflows/PR_check.yml index 04d57f1..a7cbc85 100644 --- a/.github/workflows/PR_check.yml +++ b/.github/workflows/PR_check.yml @@ -25,15 +25,9 @@ jobs: with: java-version: '11' - - name: Creat key + - name: Write properties run: | - PASSWD=$(echo $RANDOM | md5sum | head -c 15) - keytool -genkey -noprompt -v -keystore android.keystore -alias PRCHECKSIGN -keyalg RSA -keysize 2048 -validity 10000 -keypass ${PASSWD} -storepass ${PASSWD} -dname "CN=xx, OU=xx, O=xx, L=xx, S=xx, C=xx" echo buildWithGitSuffix=true >> local.properties - echo storePassword="${PASSWD}" >> local.properties - echo keyAlias="PRCHECKSIGN" >> local.properties - echo keyPassword="${PASSWD}" >> local.properties - echo fileDir='../android.keystore' >> local.properties - name: Make gradlew executable run: chmod +x ./gradlew diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8061b40..0ab3619 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: echo storePassword='${{ secrets.KEY_STORE_PASSWORD }}' >> local.properties echo keyAlias='${{ secrets.ALIAS }}' >> local.properties echo keyPassword='${{ secrets.ALIAS_KEY_PASSWORD }}' >> local.properties - echo fileDir='key.jks' >> local.properties + echo fileDir=`pwd`/key.jks >> local.properties echo "${{ secrets.KEY_STORE }}" | base64 --decode > key.jks echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > app/google-services.json diff --git a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/HomeFragment.kt b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/HomeFragment.kt index 47c8043..5b41d48 100644 --- a/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/icu/nullptr/hidemyapplist/ui/fragment/HomeFragment.kt @@ -184,7 +184,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) { withContext(Dispatchers.Main) { PrefManager.lastVersion = BuildConfig.VERSION_CODE MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.home_new_update) + .setTitle(String.format(getString(R.string.home_update), updateInfo.versionName)) .setMessage(Html.fromHtml(updateInfo.content, Html.FROM_HTML_MODE_COMPACT)) .setPositiveButton(android.R.string.ok, null) .setCancelable(false) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 53c6a8e..21413cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,7 @@ Export failed Backed up config New update available: %s + Update: %s Show system diff --git a/build.gradle.kts b/build.gradle.kts index 4a600a2..dabff6e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,16 +68,18 @@ fun Project.configureBaseExtension() { consumerProguardFiles("proguard-rules.pro") } - val signingCfg = signingConfigs.create("config") { - storeFile = rootProject.file(localProperties.getProperty("fileDir")) - storePassword = localProperties.getProperty("storePassword") - keyAlias = localProperties.getProperty("keyAlias") - keyPassword = localProperties.getProperty("keyPassword") + val config = localProperties.getProperty("fileDir")?.let { + signingConfigs.create("config") { + storeFile = file(it) + storePassword = localProperties.getProperty("storePassword") + keyAlias = localProperties.getProperty("keyAlias") + keyPassword = localProperties.getProperty("keyPassword") + } } buildTypes { all { - signingConfig = signingCfg + signingConfig = config ?: signingConfigs["debug"] } named("release") { isMinifyEnabled = true