-
Notifications
You must be signed in to change notification settings - Fork 162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Version code #941
Version code #941
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,9 @@ jobs: | |
- uses: mobile-dev-inc/[email protected] | ||
with: | ||
api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} | ||
app-file: app/build/outputs/apk/debug/app-universal-debug.apk | ||
# Doc says (https://github.com/mobile-dev-inc/action-maestro-cloud#android): | ||
# app-file should point to an x86 compatible APK file, so upload the x86_64 one (much smaller than the universal APK). | ||
app-file: app/build/outputs/apk/debug/app-x86_64-debug.apk | ||
env: | | ||
USERNAME=maestroelement | ||
PASSWORD=${{ secrets.MATRIX_MAESTRO_ACCOUNT_PASSWORD }} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,11 +124,8 @@ android { | |
} | ||
|
||
firebaseAppDistribution { | ||
artifactType = "APK" | ||
// We upload the universal APK to fix this error: | ||
// "App Distribution found more than 1 output file for this variant. | ||
// Please contact [email protected] for help using APK splits with App Distribution." | ||
artifactPath = "$rootDir/app/build/outputs/apk/nightly/app-universal-nightly.apk" | ||
artifactType = "AAB" | ||
artifactPath = "$rootDir/app/build/outputs/bundle/nightly/app-nightly.aab" | ||
// This file will be generated by the GitHub action | ||
releaseNotesFile = "CHANGES_NIGHTLY.md" | ||
groups = "external-testers" | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,33 @@ | |
import org.gradle.api.JavaVersion | ||
import org.gradle.jvm.toolchain.JavaLanguageVersion | ||
|
||
/** | ||
* Version codes are quite sensitive, because there is a mix between bundle and APKs, and we have to take into | ||
* account the future upgrade of Element Android. | ||
* Max versionCode allowed by the PlayStore (for information): | ||
* 2_100_000_000 | ||
* Current version code of EAx on the PlayStore, for the first uploaded beta (we cannot go below): | ||
* ----1_001_000 | ||
* Current version code of EAx on the nightly: | ||
* ----1_001_000 | ||
* Current version of Element Android (at some point EAx will replace this app) (v1.6.3) | ||
* ----40_106_03a where a stands for the architecture: 1, 2, 3, 4 and 0 for the universal APK | ||
* Current version of EAx distributed with Firebase app distribution: | ||
* ----1_002_000 | ||
* Latest version of EAx distributed with Firebase app distribution (downgrading, so that's a problem) | ||
* -------10_200 | ||
* Version when running the current debug build | ||
* -------10_200 | ||
* | ||
* So adding 4_000_000 to the current version Code computed here should be fine, we will have: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe mention the "multiply by 10 and add a number for the abi" logic somewhere here? It just looks like the maths is wrong at the minute 😆 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, you're right! Done. |
||
* Release version: | ||
* ---40_001_020 | ||
* Nightly version: | ||
* ---40_001_020 | ||
* Debug version: | ||
* ---40_010_200 | ||
*/ | ||
|
||
// Note: 2 digits max for each value | ||
private const val versionMajor = 0 | ||
private const val versionMinor = 1 | ||
|
@@ -27,7 +54,7 @@ private const val versionMinor = 1 | |
private const val versionPatch = 2 | ||
|
||
object Versions { | ||
val versionCode = (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) * 10 | ||
val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch | ||
val versionName = "$versionMajor.$versionMinor.$versionPatch" | ||
const val compileSdk = 33 | ||
const val targetSdk = 33 | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I guess we'll need the
ELEMENT_ANDROID_MAPTILER_*
env vars in this task if we're now building hereThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes, good point, added.