Merge/release 17.6 into develop #14929
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Binary file not shown.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,22 @@ | ||
| GIT | ||
| remote: git@github.com:wordpress-mobile/release-toolkit.git | ||
| revision: 262e6800830abc75c7d9b6817537b4c099588634 | ||
|
Contributor
Author
There was a problem hiding this comment. Pointing to a pending commit for now waiting for wordpress-mobile/release-toolkit#283 to be merged and release. IMHO it's ok to merge that PR in develop even in that temp state, and update to point to 1.3.1 later once toolkit 1.3.1 gets released (if the release-toolkit new version takes time to land, that is). Better sync with |
||
| branch: jetpack/fix-crashes | ||
| specs: | ||
| fastlane-plugin-wpmreleasetoolkit (1.3.0) | ||
| activesupport (~> 5) | ||
| bigdecimal (~> 1.4) | ||
| chroma (= 0.2.0) | ||
| diffy (~> 3.3) | ||
| git (~> 1.3) | ||
| jsonlint (~> 0.3) | ||
| nokogiri (~> 1.11) | ||
| octokit (~> 4.18) | ||
| parallel (~> 1.14) | ||
| progress_bar (~> 1.3) | ||
| rake (~> 12.3) | ||
| rake-compiler (~> 1.0) | ||
|
|
||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
|
|
@@ -101,19 +120,6 @@ GEM | |
| xcodeproj (>= 1.13.0, < 2.0.0) | ||
| xcpretty (~> 0.3.0) | ||
| xcpretty-travis-formatter (>= 0.0.3) | ||
| gh_inspector (1.1.3) | ||
| git (1.8.1) | ||
| rchardet (~> 1.8) | ||
|
|
@@ -187,7 +193,7 @@ GEM | |
| octokit (4.21.0) | ||
| faraday (>= 0.9) | ||
| sawyer (~> 0.8.0, >= 0.5.3) | ||
| oj (3.11.7) | ||
| optimist (3.0.1) | ||
| options (2.3.2) | ||
| os (1.1.1) | ||
|
|
@@ -258,7 +264,7 @@ PLATFORMS | |
|
|
||
| DEPENDENCIES | ||
| fastlane (~> 2) | ||
| fastlane-plugin-wpmreleasetoolkit! | ||
| nokogiri | ||
| rmagick (~> 4.1) | ||
|
|
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,13 +82,6 @@ android { | |
| applicationId "org.wordpress.android" | ||
| archivesBaseName = "$applicationId" | ||
|
|
||
|
Comment on lines
-85
to
-91
Contributor
Author
There was a problem hiding this comment. This comes from #14927: versioning is now handled by the |
||
| minSdkVersion rootProject.minSdkVersion | ||
| targetSdkVersion rootProject.targetSdkVersion | ||
|
|
||
|
|
@@ -130,6 +123,7 @@ android { | |
| wordpress { | ||
| isDefault true | ||
| dimension "app" | ||
|
|
||
| applicationId "org.wordpress.android" | ||
| buildConfigField "boolean", "IS_JETPACK_APP", "false" | ||
| buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"' | ||
|
|
@@ -140,6 +134,7 @@ android { | |
|
|
||
| jetpack { | ||
| dimension "app" | ||
|
|
||
| applicationId "com.jetpack.android" | ||
| buildConfigField "boolean", "IS_JETPACK_APP", "true" | ||
| buildConfigField "String", "TRACKS_EVENT_PREFIX", '"jpandroid_"' | ||
|
|
@@ -150,11 +145,6 @@ android { | |
|
|
||
| vanilla { // used for release and beta | ||
| dimension "buildType" | ||
| buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false" | ||
| buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600" | ||
| buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false" | ||
|
|
@@ -233,6 +223,39 @@ android { | |
| buildFeatures { | ||
| viewBinding true | ||
| } | ||
|
|
||
| applicationVariants.all { variant -> | ||
| def app = variant.productFlavors[0].name | ||
| def buildType = variant.productFlavors[1].name | ||
| def version = versionForVariant(app, buildType) | ||
| variant.outputs.each { output -> | ||
| output.versionNameOverride = version['versionName'] | ||
| output.versionCodeOverride = version['versionCode']?.toInteger() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Search for a variant-specific variation of the versionName and versionCode in `version.properties` file, based on the | ||
| // variant's app and buildType flavors. | ||
| // | ||
| // This will search the `version.properties` file for "$app.$buildType.versionName" first, and fallback to "$app.versionName" then just "versionName" (and same for versionCode) | ||
| // Note: If the property is overridden at project level (e.g. '-PversionName'), it will take priority over any value in `version.properties`. | ||
| // | ||
| // Returns a Hash with keys 'versionName' and 'versionCode', with the found values for the app and buildType provided. | ||
| def versionForVariant(app, buildType) { | ||
| def versionProperties = new Properties() | ||
| file("../version.properties").withInputStream { versionProperties.load(it) } | ||
|
|
||
| def propertyForVariant = { property -> | ||
| return project.findProperty(property) | ||
| ?: versionProperties.getProperty("${app}.${buildType}.${property}") | ||
| ?: versionProperties.getProperty("${app}.${property}") | ||
| ?: versionProperties.getProperty(property) | ||
| } | ||
|
|
||
| def versionName = propertyForVariant('versionName') | ||
| def versionCode = propertyForVariant('versionCode') | ||
| return [versionName: versionName, versionCode: versionCode] | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
@@ -495,9 +518,29 @@ tasks.register("violationCommentsToGitHub", se.bjurr.violations.comments.github. | |
| ] | ||
| } | ||
|
|
||
| tasks.register("updateVersionProperties") { | ||
| doLast { | ||
| ant.propertyfile( | ||
| file: "../version.properties") { | ||
| entry( key: "$key", value: "$value") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| tasks.register("printVersionName") { | ||
| doLast { | ||
| def app = project.findProperty('productKey') ?: 'wordpress' | ||
| def buildType = project.findProperty('buildType') ?: '' | ||
| println versionForVariant(app, buildType)['versionName'] | ||
| } | ||
| } | ||
|
|
||
| tasks.register("printAllVersions") { | ||
| doLast { | ||
| android.applicationVariants.all { variant -> | ||
| def apkData = variant.outputs[0].apkData | ||
| println "${variant.name}: ${apkData.versionName} (${apkData.versionCode})" | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| # Translation of Jetpack - Apps - Android - Release Notes in English (US) | ||
| # This file is distributed under the same license as the Jetpack - Apps - Android - Release Notes package. | ||
| msgid "" | ||
| msgstr "" | ||
| "PO-Revision-Date: 2018-05-23 11:49:24+0000\n" | ||
| "MIME-Version: 1.0\n" | ||
| "Content-Type: text/plain; charset=UTF-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Plural-Forms: nplurals=2; plural=n != 1;\n" | ||
| "X-Generator: VsCode\n" | ||
| "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n" | ||
|
|
||
| #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas! | ||
| msgctxt "release_note_176" | ||
| msgid "" | ||
| "17.6:\n" | ||
| "The Audio Block lets you add podcasts, music, and sound files to your posts and pages. It’s now available for Free Plan users, too!\n" | ||
| "\n" | ||
| "Turn any image into a *featured* image, with the new ‘Set as Featured’ button in the Image block.\n" | ||
| "\n" | ||
| "Finally, we made it clearer that you can’t edit the automatically generated post archives page.\n" | ||
| msgstr "" | ||
|
|
||
| #. translators: Short description of the Jetpack app to be displayed in the Play Store. Limit to 80 characters including spaces and commas! | ||
| msgctxt "short-description" | ||
| msgid "Get powerful security and performance tools in your pocket." | ||
| msgstr "" | ||
|
|
||
| #. translators: Multi-paragraph text used to display in the Play Store. | ||
| msgctxt "app-store-description" | ||
| msgid "" | ||
| "Get powerful security and performance tools in your pocket with Jetpack for Android.\n" | ||
| "\n" | ||
| "Restore your site from anywhere if something goes wrong. Scan for threats and resolve them with a tap. Keep tabs on site activity to see who changed what and when. Check your stats to see what new countries today’s visitors are coming from.\n" | ||
| "\n" | ||
| "The app also supports WordPress features that you expect. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments.\n" | ||
| "\n" | ||
| "Jetpack for Android supports WordPress sites with Jetpack enabled and an account connected to WordPress.com.\n" | ||
| "\n" | ||
| "View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa." | ||
| msgstr "" | ||
|
|
||
| #. App store app name | ||
| msgctxt "app-store-name" | ||
| msgid "Jetpack: WP Security & Speed" | ||
| msgstr "Jetpack : WP Security & Speed" | ||
|
|
||
| #. Description for the first app store image | ||
| msgctxt "screenshot-text-1" | ||
| msgid "" | ||
| "Safer.\n" | ||
| "Faster.\n" | ||
| "More traffic." | ||
| msgstr "" | ||
|
|
||
| #. Description for the second app store image | ||
| msgctxt "screenshot-text-2" | ||
| msgid "" | ||
| "Bring your\n" | ||
| "Jetpack with you." | ||
| msgstr "" | ||
|
|
||
| #. Description for the third app store image | ||
| msgctxt "screenshot-text-3" | ||
| msgid "" | ||
| "Keep tabs on\n" | ||
| "your site activity." | ||
| msgstr "" | ||
|
|
||
| #. Description for the fourth app store image | ||
| msgctxt "screenshot-text-4" | ||
| msgid "" | ||
| "Scan for issues\n" | ||
| "on the go." | ||
| msgstr "" | ||
|
|
||
| #. Description for the fifth app store image | ||
| msgctxt "screenshot-text-5" | ||
| msgid "" | ||
| "Back Up your site\n" | ||
| "at any moment." | ||
| msgstr "" | ||
|
|
||
| #. Description for the sixth app store image | ||
| msgctxt "screenshot-text-6" | ||
| msgid "" | ||
| "Site stats in your\n" | ||
| "pocket." | ||
| msgstr "" | ||
|
|
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Points to the new
google-services.jsonwith the correct signing fingerprint for Jetpack