Skip to content

Commit

Permalink
Merge pull request #190 from shoutem/hotfix/12.1.2
Browse files Browse the repository at this point in the history
Hotfix/12.1.2
  • Loading branch information
majaklajic authored Nov 8, 2022
2 parents 46698be + bd4f92c commit e76639d
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
7 changes: 7 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ 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 ->
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/platform",
"version": "12.1.1",
"version": "12.1.2",
"scripts": {
"android": "react-native run-android",
"build": "node scripts/build",
Expand Down
9 changes: 7 additions & 2 deletions package.template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/platform",
"version": "12.1.1",
"version": "12.1.2",
"scripts": {
"android": "react-native run-android",
"build": "node scripts/build",
Expand Down Expand Up @@ -93,7 +93,12 @@
"react-native/no-raw-text": [
1,
{
"skip": ["Caption", "Heading", "Subtitle", "Title"]
"skip": [
"Caption",
"Heading",
"Subtitle",
"Title"
]
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions platform/platform.json
Original file line number Diff line number Diff line change
@@ -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",
"mobileAppVersion": "12.1.2",
"releaseNotes": "* Resolve Android build failure",
"settings": {
"DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur",
"QA-appetizeKey": "u3ug4mvtp5as3qverih4bkaksm",
Expand All @@ -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",
"shoutem.camera": "~5.0.0",
"shoutem.cms": "~6.1.4",
"shoutem.code-push": "~4.1.1",
Expand Down
6 changes: 6 additions & 0 deletions scripts/helpers/const.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,14 @@ 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',
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',
Expand Down

0 comments on commit e76639d

Please sign in to comment.