ci: improve hash format

nymtech · Apr 5, 2024 · aa95422 · aa95422
1 parent c0f7681
commit aa95422
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -119,7 +119,7 @@ jobs:
 
       - name: Get checksum
         id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")\n" >> $GITHUB_OUTPUT
+        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")" | awk '{$1=$1};1' >> $GITHUB_OUTPUT
 
       - name: Append checksum
         id: append_checksum
@@ -128,7 +128,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: >
-            ### SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
+            SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
           draft: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -120,7 +120,7 @@ jobs:
 
       - name: Get checksum
         id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")\n" >> $GITHUB_OUTPUT
+        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")" | awk '{$1=$1};1' >> $GITHUB_OUTPUT
 
       - name: Append checksum
         id: append_checksum
@@ -129,7 +129,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: >
-            ### SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
+            SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
           draft: false

diff --git a/app/src/androidTest/java/net/nymtech/nymvpn/ExampleInstrumentedTest.kt b/app/src/androidTest/java/net/nymtech/nymvpn/ExampleInstrumentedTest.kt
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val context = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("net.nymtech.nymvpn", appContext.packageName)
+        assertEquals("net.nymtech.nymvpn", context.packageName)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 accompanist = "0.34.0"
 agp = "8.3.1"
-converterMoshi = "2.9.0"
+converterMoshi = "2.10.0"
 coreSplashscreen = "1.0.1"
 detektRulesCompose = "1.3.0"
 jna = "5.14.0"
@@ -11,7 +11,7 @@ coreKtx = "1.12.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
-materialIconsExtended = "1.6.4"
+materialIconsExtended = "1.6.5"
 moshi = "1.15.1"
 moshiKotlin = "1.15.1"
 moshiKotlinCodegen = "1.15.1"
@@ -20,22 +20,21 @@ hiltNavigationCompose = "1.2.0"
 lifecycleRuntimeKtx = "2.7.0"
 lifecycle-runtime-compose = "2.7.0"
 activityCompose = "1.8.2"
-composeBom = "2024.03.00"
+composeBom = "2024.04.00"
 datastorePreferences = "1.0.0"
 timber = "5.0.1"
 hiltAndroid = "2.51"
 kotlinx-serialization-json = "1.6.3"
 kotlinxCoroutinesCore = "1.8.0"
 window = "1.2.0"
-windowCoreAndroid = "1.3.0-alpha03"
+windowCoreAndroid = "1.3.0-beta01"
 desugar = "2.0.4"
 
 gradlePlugins-kotlinxSerialization = "1.9.23"
 gradlePlugins-licensee = "1.7.0"
-gradlePlugins-detekt = "1.23.1"
+gradlePlugins-detekt = "1.23.6"
 gradlePlugins-gross = "0.1.0"
 gradlePlugins-sentry = "4.3.1"
-gradlePlugins-checksum = "1.4.0"
 appcompat = "1.6.1"
 material = "1.11.0"
 
@@ -107,6 +106,4 @@ gross = { id = "se.premex.gross", version.ref = "gradlePlugins-gross" }
 kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "gradlePlugins-kotlinxSerialization" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "gradlePlugins-detekt" }
 sentry = { id = "io.sentry.android.gradle", version.ref = "gradlePlugins-sentry" }
-checksum = { id = "org.gradle.crypto.checksum", version.ref = "gradlePlugins-checksum" }
-