Mercurial > public > simoleon

changeset 126:d23c3e825d03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #15 from DennisTechnologies/development Publish first beta for v1.3.1 committer: GitHub <noreply@github.com>
author Dennis C. M. <dennis@denniscm.com>
date Sun, 15 Aug 2021 15:09:17 +0100
parents 81ea5f034437 (current diff) bee9102c2e9c (diff)
children 0e693e85db9b
files
diffstat 7 files changed, 13 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/ios.yml	Sun Aug 15 11:10:48 2021 +0100
+++ b/.github/workflows/ios.yml	Sun Aug 15 15:09:17 2021 +0100
@@ -1,8 +1,6 @@
 name: Build and test
 
 on:
-  push:
-    branches: [ development ]
   pull_request:
     branches: [ main, beta ]
 
--- a/Gemfile.lock	Sun Aug 15 11:10:48 2021 +0100
+++ b/Gemfile.lock	Sun Aug 15 15:09:17 2021 +0100
@@ -7,7 +7,7 @@
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.1.1)
-    aws-partitions (1.482.0)
+    aws-partitions (1.487.0)
     aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -36,7 +36,7 @@
     dotenv (2.7.6)
     emoji_regex (3.2.2)
     excon (0.85.0)
-    faraday (1.6.0)
+    faraday (1.7.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -60,8 +60,8 @@
     faraday-rack (1.0.0)
     faraday_middleware (1.1.0)
       faraday (~> 1.0)
-    fastimage (2.2.4)
-    fastlane (2.189.0)
+    fastimage (2.2.5)
+    fastlane (2.191.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -189,7 +189,7 @@
     unicode-display_width (1.7.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.20.0)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
--- a/Simoleon.xcodeproj/project.pbxproj	Sun Aug 15 11:10:48 2021 +0100
+++ b/Simoleon.xcodeproj/project.pbxproj	Sun Aug 15 15:09:17 2021 +0100
@@ -894,7 +894,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Simoleon/Simoleon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Simoleon/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
@@ -904,7 +904,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.dennistech.Simoleon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -919,7 +919,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Simoleon/Simoleon.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Simoleon/Preview Content\"";
 				DEVELOPMENT_TEAM = MTX83R5H8X;
 				ENABLE_PREVIEWS = YES;
@@ -929,7 +929,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.dennistech.Simoleon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
--- a/Simoleon/Info.plist	Sun Aug 15 11:10:48 2021 +0100
+++ b/Simoleon/Info.plist	Sun Aug 15 15:09:17 2021 +0100
@@ -23,7 +23,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>PURCHASES_KEY</key>
--- a/SimoleonTests/Info.plist	Sun Aug 15 11:10:48 2021 +0100
+++ b/SimoleonTests/Info.plist	Sun Aug 15 15:09:17 2021 +0100
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>1</string>
 </dict>
 </plist>
--- a/SimoleonUITests/Info.plist	Sun Aug 15 11:10:48 2021 +0100
+++ b/SimoleonUITests/Info.plist	Sun Aug 15 15:09:17 2021 +0100
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>1</string>
 </dict>
 </plist>
--- a/fastlane/Fastfile	Sun Aug 15 11:10:48 2021 +0100
+++ b/fastlane/Fastfile	Sun Aug 15 15:09:17 2021 +0100
@@ -19,11 +19,7 @@
 
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    increment_build_number(
-      build_number: latest_testflight_build_number + 1,
-      xcodeproj: "Simoleon.xcodeproj"
-    )
-    
+    increment_build_number(xcodeproj: "Simoleon.xcodeproj")
     build_app(scheme: "Simoleon")
     upload_to_testflight(
       beta_app_review_info: {