Merge pull request #60 from cohen72/develop

merge develop into master

.github/workflows/release.yml

@@ -4,12 +4,11 @@ on:
   push:
     branches:
       - master
-      - beta
-      - next
+      - develop
 
 jobs:
   release:
-    name: Release
+    name: Deploy
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -32,9 +31,9 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: If on master, merge back to beta
+      - name: If on master, merge back semantic release commits back to develop
         if: github.ref == 'refs/heads/master'
         run: |
-          git checkout beta
+          git checkout develop
           git merge --ff-only master
-          git push --force --set-upstream origin beta
+          git push --force --set-upstream origin develop

README.md

@@ -4,3 +4,5 @@
 2
 3
 4
+5
+6

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy "RNN.reactNativeVersion", "reactNative60" // See note below!
-        versionCode 134
-        versionName "1.0.6"
+        versionCode 136
+        versionName "1.0.7-qa.1"
         multiDexEnabled true
         resValue "string", "build_config_package", "com.colu.newcities"
     }

ios/ColuConsumerRn/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>134</string>
+	<string>136</string>
 	<key>FacebookAppID</key>
 	<string>800294393431311</string>
 	<key>FacebookDisplayName</key>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "git-playground",
-	"version": "1.0.6",
+	"version": "1.0.7-qa.1",
 	"private": true,
 	"scripts": {
 		"postversion": "react-native-version --never-amend"