From 8433d497cba0fc6b3c8303a8d7484c5359e3d559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maja=20Klajic=CC=81?= Date: Mon, 7 Nov 2022 16:39:42 +0100 Subject: [PATCH 1/4] Add new anchor to build.gradle --- android/build.gradle | 1 + package.json | 2 +- package.template.json | 9 +++++++-- platform/platform.json | 8 ++++---- scripts/helpers/const.js | 2 ++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b432be216c..f79477cf4d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -45,6 +45,7 @@ allprojects { } //NativeModuleInjectionMark-root-gradle-allprojects-repositories } + //NativeModuleInjectionMark-root-gradle-allprojects } subprojects { subproject -> diff --git a/package.json b/package.json index bba182b313..51fef3ef42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.1", + "version": "12.1.2-rc.0", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/package.template.json b/package.template.json index 36566557d8..51fef3ef42 100644 --- a/package.template.json +++ b/package.template.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.1", + "version": "12.1.2-rc.0", "scripts": { "android": "react-native run-android", "build": "node scripts/build", @@ -93,7 +93,12 @@ "react-native/no-raw-text": [ 1, { - "skip": ["Caption", "Heading", "Subtitle", "Title"] + "skip": [ + "Caption", + "Heading", + "Subtitle", + "Title" + ] } ] } diff --git a/platform/platform.json b/platform/platform.json index 4971d8df5c..b0f88c53d9 100644 --- a/platform/platform.json +++ b/platform/platform.json @@ -1,7 +1,7 @@ { - "version": "12.1.1", - "mobileAppVersion": "12.1.1", - "releaseNotes": "* For devs: Resolved issue with importing from Shoutem extensions into custom extensions", + "version": "12.1.2-rc.0", + "mobileAppVersion": "12.1.2-rc.0", + "releaseNotes": "* Resolve Android build failure", "settings": { "DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur", "QA-appetizeKey": "u3ug4mvtp5as3qverih4bkaksm", @@ -25,7 +25,7 @@ "shoutem.analytics": "~4.1.0", "shoutem.application": "~6.0.0", "shoutem.audio": "~4.0.4", - "shoutem.auth": "~7.1.1", + "shoutem.auth": "~7.1.2-rc.0", "shoutem.camera": "~5.0.0", "shoutem.cms": "~6.1.4", "shoutem.code-push": "~4.1.1", diff --git a/scripts/helpers/const.js b/scripts/helpers/const.js index 0c6fdf77fa..0413b11b4d 100644 --- a/scripts/helpers/const.js +++ b/scripts/helpers/const.js @@ -118,6 +118,8 @@ const ANCHORS = { ANDROID_END: '//NativeModuleInjectionMark-app-gradle-android-end', }, ROOT_GRADLE: '//NativeModuleInjectionMark-root-gradle', + ROOT_GRADLE_ALLPROJECTS: + '//NativeModuleInjectionMark-root-gradle-allprojects', ROOT_GRADLE_ALLPROJECTS_REPOSITORIES: '//NativeModuleInjectionMark-root-gradle-allprojects-repositories', PROPERTIES: '#NativeModuleInjectionMark-gradle-properties', From e8ba023ac454a6bcf6882cca84c5ce61bb993334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maja=20Klajic=CC=81?= Date: Mon, 7 Nov 2022 18:47:53 +0100 Subject: [PATCH 2/4] Added new anchors and reworked resolutioStrategy injection --- android/build.gradle | 6 ++++++ package.json | 2 +- package.template.json | 2 +- platform/platform.json | 6 +++--- scripts/helpers/const.js | 4 ++++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f79477cf4d..df7d4e6494 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -46,6 +46,12 @@ allprojects { //NativeModuleInjectionMark-root-gradle-allprojects-repositories } //NativeModuleInjectionMark-root-gradle-allprojects + configurations.all { + //NativeModuleInjectionMark-root-gradle-allprojects-configurations.all + resolutionStrategy { + //NativeModuleInjectionMark-root-gradle-allprojects-configurations.all-resolutionStrategy + } + } } subprojects { subproject -> diff --git a/package.json b/package.json index 51fef3ef42..9cfc7494ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.0", + "version": "12.1.2-rc.1", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/package.template.json b/package.template.json index 51fef3ef42..9cfc7494ec 100644 --- a/package.template.json +++ b/package.template.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.0", + "version": "12.1.2-rc.1", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/platform/platform.json b/platform/platform.json index b0f88c53d9..dfc06d2e24 100644 --- a/platform/platform.json +++ b/platform/platform.json @@ -1,6 +1,6 @@ { - "version": "12.1.2-rc.0", - "mobileAppVersion": "12.1.2-rc.0", + "version": "12.1.2-rc.1", + "mobileAppVersion": "12.1.2-rc.1", "releaseNotes": "* Resolve Android build failure", "settings": { "DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur", @@ -25,7 +25,7 @@ "shoutem.analytics": "~4.1.0", "shoutem.application": "~6.0.0", "shoutem.audio": "~4.0.4", - "shoutem.auth": "~7.1.2-rc.0", + "shoutem.auth": "~7.1.2-rc.1", "shoutem.camera": "~5.0.0", "shoutem.cms": "~6.1.4", "shoutem.code-push": "~4.1.1", diff --git a/scripts/helpers/const.js b/scripts/helpers/const.js index 0413b11b4d..f71984e012 100644 --- a/scripts/helpers/const.js +++ b/scripts/helpers/const.js @@ -122,6 +122,10 @@ const ANCHORS = { '//NativeModuleInjectionMark-root-gradle-allprojects', ROOT_GRADLE_ALLPROJECTS_REPOSITORIES: '//NativeModuleInjectionMark-root-gradle-allprojects-repositories', + ROOT_GRADLE_ALLPROJECTS_CONFIGURATIONS_ALL: + '//NativeModuleInjectionMark-root-gradle-allprojects-configurations.all', + ROOT_GRADLE_ALLPROJECTS_CONFIGURATIONS_ALL_RESOLUTION_STRATEGY: + '//NativeModuleInjectionMark-root-gradle-allprojects-configurations.all-resolutionStrategy', PROPERTIES: '#NativeModuleInjectionMark-gradle-properties', CONSTANTS: '//NativeModuleInjectionMark-gradle-constants', SETTINGS: '//NativeModuleInjectionMark-gradle-settings', From 67bee197450df57a348dca10d59e7cbfff4e734c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maja=20Klajic=CC=81?= Date: Tue, 8 Nov 2022 09:13:45 +0100 Subject: [PATCH 3/4] Bump versions --- package.json | 2 +- package.template.json | 2 +- platform/platform.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9cfc7494ec..9583f5499e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.1", + "version": "12.1.2-rc.2", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/package.template.json b/package.template.json index 9cfc7494ec..9583f5499e 100644 --- a/package.template.json +++ b/package.template.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.1", + "version": "12.1.2-rc.2", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/platform/platform.json b/platform/platform.json index dfc06d2e24..f6c5d92d0a 100644 --- a/platform/platform.json +++ b/platform/platform.json @@ -1,6 +1,6 @@ { - "version": "12.1.2-rc.1", - "mobileAppVersion": "12.1.2-rc.1", + "version": "12.1.2-rc.2", + "mobileAppVersion": "12.1.2-rc.2", "releaseNotes": "* Resolve Android build failure", "settings": { "DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur", From bd4f92c1db044903b9023eacc557b65369196d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maja=20Klajic=CC=81?= Date: Tue, 8 Nov 2022 10:09:57 +0100 Subject: [PATCH 4/4] Set release version --- package.json | 2 +- package.template.json | 2 +- platform/platform.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9583f5499e..9ff5e8e23b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.2", + "version": "12.1.2", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/package.template.json b/package.template.json index 9583f5499e..9ff5e8e23b 100644 --- a/package.template.json +++ b/package.template.json @@ -1,6 +1,6 @@ { "name": "@shoutem/platform", - "version": "12.1.2-rc.2", + "version": "12.1.2", "scripts": { "android": "react-native run-android", "build": "node scripts/build", diff --git a/platform/platform.json b/platform/platform.json index f6c5d92d0a..97cb3cda87 100644 --- a/platform/platform.json +++ b/platform/platform.json @@ -1,6 +1,6 @@ { - "version": "12.1.2-rc.2", - "mobileAppVersion": "12.1.2-rc.2", + "version": "12.1.2", + "mobileAppVersion": "12.1.2", "releaseNotes": "* Resolve Android build failure", "settings": { "DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur", @@ -25,7 +25,7 @@ "shoutem.analytics": "~4.1.0", "shoutem.application": "~6.0.0", "shoutem.audio": "~4.0.4", - "shoutem.auth": "~7.1.2-rc.1", + "shoutem.auth": "~7.1.2", "shoutem.camera": "~5.0.0", "shoutem.cms": "~6.1.4", "shoutem.code-push": "~4.1.1",