Skip to content

Commit f46a9d6

Browse files
weblatebmarty
authored andcommitted
Update release script now that there is only on crypto implementation.
1 parent b27dc02 commit f46a9d6

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

tools/release/releaseScript.sh

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,19 @@ adb -e uninstall im.vector.app.debug.test
160160

161161
printf "\n================================================================================\n"
162162
printf "Running the integration test UiAllScreensSanityTest.allScreensTest()...\n"
163-
./gradlew connectedGplayRustCryptoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
163+
./gradlew connectedGplayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest
164164

165165
printf "\n================================================================================\n"
166166
printf "Building the app...\n"
167-
./gradlew assembleGplayRustCryptoDebug
167+
./gradlew assembleGplayDebug
168168

169169
printf "\n================================================================================\n"
170170
printf "Uninstalling previous debug app if any...\n"
171171
adb -e uninstall im.vector.app.debug
172172

173173
printf "\n================================================================================\n"
174174
printf "Installing the app...\n"
175-
adb -e install ./vector-app/build/outputs/apk/gplayRustCrypto/debug/vector-gplay-rustCrypto-arm64-v8a-debug.apk
175+
adb -e install ./vector-app/build/outputs/apk/gplay/debug/vector-gplay-arm64-v8a-debug.apk
176176

177177
printf "\n================================================================================\n"
178178
printf "Running the app...\n"
@@ -293,67 +293,67 @@ printf "Unzipping the artifact...\n"
293293
unzip ${targetPath}/vector-gplay-release-unsigned.zip -d ${targetPath}
294294

295295
# Flatten folder hierarchy
296-
mv ${targetPath}/gplayRustCrypto/release/* ${targetPath}
296+
mv ${targetPath}/gplay/release/* ${targetPath}
297297
rm -rf ${targetPath}/gplay
298298

299299
printf "\n================================================================================\n"
300300
printf "Signing the APKs...\n"
301301

302-
cp ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-unsigned.apk \
303-
${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk
302+
cp ${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk \
303+
${targetPath}/vector-gplay-arm64-v8a-release-signed.apk
304304
./tools/release/sign_apk_unsafe.sh \
305305
${keyStorePath} \
306-
${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk \
306+
${targetPath}/vector-gplay-arm64-v8a-release-signed.apk \
307307
${keyStorePassword} \
308308
${keyPassword}
309309

310-
cp ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-unsigned.apk \
311-
${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk
310+
cp ${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk \
311+
${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk
312312
./tools/release/sign_apk_unsafe.sh \
313313
${keyStorePath} \
314-
${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk \
314+
${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk \
315315
${keyStorePassword} \
316316
${keyPassword}
317317

318-
cp ${targetPath}/vector-gplay-rustCrypto-x86-release-unsigned.apk \
319-
${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk
318+
cp ${targetPath}/vector-gplay-x86-release-unsigned.apk \
319+
${targetPath}/vector-gplay-x86-release-signed.apk
320320
./tools/release/sign_apk_unsafe.sh \
321321
${keyStorePath} \
322-
${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk \
322+
${targetPath}/vector-gplay-x86-release-signed.apk \
323323
${keyStorePassword} \
324324
${keyPassword}
325325

326-
cp ${targetPath}/vector-gplay-rustCrypto-x86_64-release-unsigned.apk \
327-
${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk
326+
cp ${targetPath}/vector-gplay-x86_64-release-unsigned.apk \
327+
${targetPath}/vector-gplay-x86_64-release-signed.apk
328328
./tools/release/sign_apk_unsafe.sh \
329329
${keyStorePath} \
330-
${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk \
330+
${targetPath}/vector-gplay-x86_64-release-signed.apk \
331331
${keyStorePassword} \
332332
${keyPassword}
333333

334334
# Ref: https://docs.fastlane.tools/getting-started/android/beta-deployment/#uploading-your-app
335-
# set SUPPLY_APK_PATHS="${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-x86-release-unsigned.apk,${targetPath}/vector-gplay-rustCrypto-x86_64-release-unsigned.apk"
335+
# set SUPPLY_APK_PATHS="${targetPath}/vector-gplay-arm64-v8a-release-unsigned.apk,${targetPath}/vector-gplay-armeabi-v7a-release-unsigned.apk,${targetPath}/vector-gplay-x86-release-unsigned.apk,${targetPath}/vector-gplay-x86_64-release-unsigned.apk"
336336
#
337337
# ./fastlane beta
338338

339339
printf "\n================================================================================\n"
340340
printf "Please check the information below:\n"
341341

342-
printf "File vector-gplay-rustCrypto-arm64-v8a-release-signed.apk:\n"
343-
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk | grep package
344-
printf "File vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk:\n"
345-
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-armeabi-v7a-release-signed.apk | grep package
346-
printf "File vector-gplay-rustCrypto-x86-release-signed.apk:\n"
347-
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-x86-release-signed.apk | grep package
348-
printf "File vector-gplay-rustCrypto-x86_64-release-signed.apk:\n"
349-
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-rustCrypto-x86_64-release-signed.apk | grep package
342+
printf "File vector-gplay-arm64-v8a-release-signed.apk:\n"
343+
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-arm64-v8a-release-signed.apk | grep package
344+
printf "File vector-gplay-armeabi-v7a-release-signed.apk:\n"
345+
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-armeabi-v7a-release-signed.apk | grep package
346+
printf "File vector-gplay-x86-release-signed.apk:\n"
347+
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86-release-signed.apk | grep package
348+
printf "File vector-gplay-x86_64-release-signed.apk:\n"
349+
${buildToolsPath}/aapt dump badging ${targetPath}/vector-gplay-x86_64-release-signed.apk | grep package
350350

351351
printf "\n"
352352
read -p "Does it look correct? Press enter when it's done."
353353

354354
printf "\n================================================================================\n"
355355
read -p "Installing apk on a real device, press enter when a real device is connected. "
356-
apkPath="${targetPath}/vector-gplay-rustCrypto-arm64-v8a-release-signed.apk"
356+
apkPath="${targetPath}/vector-gplay-arm64-v8a-release-signed.apk"
357357
adb -d install ${apkPath}
358358

359359
read -p "Please run the APK on your phone to check that the upgrade went well (no init sync, etc.). Press enter when it's done."

0 commit comments

Comments
 (0)