Merge branch 'master' into GI#94-ask-app-review

ModusCreateOrg · Oct 1, 2018 · c907e89 · c907e89
2 parents d1e277f + cd9212d
commit c907e89
Show file tree

Hide file tree

Showing 14 changed files with 2,855 additions and 2,827 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -89,7 +89,7 @@ jobs:
       - restore_cache: *restore-dist-cache
       - run:
           name: Build iOS project
-          command: npm run build-ios-ci
+          command: npm run build-ios
       - save_cache:
           key: v3-ios-{{ .Environment.CIRCLE_SHA1 }}
           paths:

diff --git a/README.md b/README.md
@@ -38,6 +38,13 @@ Beep is one of the first apps built on Vue.JS and Ionic Framework. With this com
 
 We've made sure that Beep won't end up yet another name on the list of data breaches. How? We hash all of your passwords and account information. In other words, we never store your passwords in plain text. Instead, we transform your password into a really, really long code and then, we send only the first five characters of that code to a server.
 
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-01.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-01.png)
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-02.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-02.png)
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-03.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-03.png)
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-04.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-04.png)
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-05.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-05.png)
+[![Beep Screenshot](https://res.cloudinary.com/modus-labs/image/upload/w_130,f_auto,dpr_auto/v1538144594/beep/Beep-Screenshot-iPhoneX-06.png)](https://res.cloudinary.com/modus-labs/image/upload/v1538144594/beep/Beep-Screenshot-iPhoneX-06.png)
+
 # Installing
 
 Once you clone this repo go into the terminal and install dependencies.

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "app.modus.beep"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 4
-        versionName "1.0.1"
+        versionCode 8
+        versionName "1.0.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {

diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
@@ -51,8 +51,7 @@ platform :android do
   end
 
   lane :hockeybeta do
-    increment_version_code gradle_build: 'app/build.gradle'
-    gradle(task: "clean assembleRelease")
+    release
     hockey(
       api_token: ENV["HOCKEY_API_TOKEN"]
     )

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -386,7 +386,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 287TS9B2H2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -410,7 +410,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 287TS9B2H2;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20</string>
+	<string>24</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/ios/App/fastlane/Fastfile b/ios/App/fastlane/Fastfile
@@ -34,4 +34,9 @@ platform :ios do
       api_token: ENV["HOCKEY_API_TOKEN"]
     )
   end
+
+  lane :deployall do
+    hockeybeta
+    upload_to_testflight
+  end
 end
diff --git a/ios/App/fastlane/README.md b/ios/App/fastlane/README.md
@@ -26,6 +26,11 @@ Push a new beta build to TestFlight
 fastlane ios hockeybeta
 ```
 
+### ios deployall
+```
+fastlane ios deployall
+```
+
 
 ----