VPN-6290 - Stop using the glean sdk generator script #9326
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brizental
changed the title
brizental
force-pushed
the
chore-kill-sdk-generator
branch
from
52fbc57 to
9646c12
Compare
brizental
changed the title
brizental
force-pushed
the
chore-kill-sdk-generator
branch
2 times, most recently
from
900ce15 to
15f3abb
Compare
brizental
changed the title
|
@strseb I am assuming now we don't need to run gradle twice in cmake.sh? From local testing it seems to work -- the apk was created fine with just |
strseb
reviewed
Apr 11, 2024
| @@ -52,6 +41,8 @@ android { | |||
| minSdkVersion Config.minSdkVersion | |||
| targetSdkVersion Config.targetSdkVersion | |||
|
|
|||
| buildConfigField "int", "VERSION_CODE", System.getenv("VERSIONCODE") ?: "99999" | |||
| buildConfigField "String", "VERSION_NAME", '"' + (System.getenv("SHORTVERSION") ?: "") + '"' | |||
| buildConfigField "String", "VERSIONCODE" , '"' +System.getenv("VERSIONCODE") + '"' | |||
There was a problem hiding this comment.
Oh, one is "VERSIONCODE" and the other is "VERSION_CODE" 👀
It's good you commented here. It reminds me I had a little issue with these variables.
You and the internet had told me I should use versionName and versionCode here and they would set these variables. That didn't work though, that is why I used buildConfigField here instead.
Also, I set these in a bunch of places, but I could not figure out how to just set it once. I don't like the way it is right now :(
strseb
reviewed
Apr 11, 2024
strseb
reviewed
Apr 11, 2024
brizental
force-pushed
the
chore-kill-sdk-generator
branch
from
aae3f96 to
fed0f15
Compare
strseb
reviewed
Apr 15, 2024
| dependencyResolutionManagement { | ||
| versionCatalogs { | ||
| create("gleanLibs") { | ||
| from(files("$gleanVendoredPath/gradle/libs.versions.toml")) |
strseb
approved these changes
Apr 15, 2024
brizental
force-pushed
the
chore-kill-sdk-generator
branch
4 times, most recently
from
591a944 to
1823996
Compare
brizental
force-pushed
the
chore-kill-sdk-generator
branch
from
1823996 to
05d0dad
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We should do the same for Android. Let's do it in a separate PR because this is currently breaking CI IIUC.Doing Android here since fixing things for iOS broke them for Android.