getsentry · philipphofmann · Mar 4, 2021 · Feb 16, 2021 · Feb 16, 2021 · Feb 17, 2021
diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -38,22 +38,30 @@ jobs:
         with:
           ruby-version: '2.7'
 
+      - name: Install SentryCli
+        run: brew install getsentry/tools/sentry-cli
+
       - name: Setup fastlane
         run: bundle install   
 
       # We upload a new version to TestFlight on every commit on Master
       # So we need to bump the bundle version each time
       - name: Bump Bundle Version
         env: 
-          FASTLANE_BUNDLE_VERSION: $GITHUB_RUN_NUMBER
+          FASTLANE_BUNDLE_VERSION: ${{ github.run_number }}
         run: bundle exec fastlane bump_bundle_version
         shell: sh
 
+      - name: Remove preview version suffixes
+        run: bundle exec fastlane remove_preview_version_suffixes
+        shell: sh
+
       - name: Run Fastlane
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
           APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
           APP_STORE_CONNECT_KEY: ${{ secrets.APP_STORE_CONNECT_KEY }}
+          FASTLANE_BUNDLE_VERSION: ${{ github.run_number }}
           FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
           FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }}
           FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
@@ -64,3 +72,12 @@ jobs:
         run: bundle exec fastlane ios_swift_to_testflight
         shell: sh
 
+      - name: Archiving
+        uses: actions/upload-artifact@v2
+        with:
+          name: dSYMs 
+          path: |
+            ${{ github.workspace }}/iOS-Swift.*
+            ${{ github.workspace }}/*.dSYM.zip
+            ${{ github.workspace }}/dSYMs/
+
diff --git a/Gemfile b/Gemfile
@@ -4,3 +4,6 @@ gem "bundler", ">= 2"
 gem "cocoapods", ">= 1.9.1"
 gem "fastlane"
 gem "rest-client"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -135,6 +135,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-sentry (1.8.0)
     ffi (1.14.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -272,6 +273,7 @@ DEPENDENCIES
   bundler (>= 2)
   cocoapods (>= 1.9.1)
   fastlane
+  fastlane-plugin-sentry
   rest-client
 
 BUNDLED WITH

diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -400,7 +400,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.0.0-alpha.0;
+				MARKETING_VERSION = "7.0.0-alpha.0";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
@@ -423,7 +423,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.0.0-alpha.0;
+				MARKETING_VERSION = "7.0.0-alpha.0";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";

diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -24,7 +24,7 @@ class ViewController: UIViewController {
         }
         // Also works
         let user = Sentry.User(userId: "1")
-        user.email = "tony@example.com"
+        user.email = "tony1@example.com"
         SentrySDK.setUser(user)
     }
 

diff --git a/Utils/VersionBump/Package.swift b/Utils/VersionBump/Package.swift
@@ -7,9 +7,7 @@ let package = Package(
         .executable(name: "VersionBump", targets: ["VersionBump"])
     ],
     dependencies: [
-        // We need to use the 5.1.0-beta.1, because otherwise we can't compile with Swift 5.3
-        // see https://github.com/kareman/SwiftShell/releases/tag/5.1.0-beta.1
-        .package(url: "https://github.com/kareman/SwiftShell.git", from: "5.1.0-beta.1"),
+        .package(url: "https://github.com/kareman/SwiftShell.git", from: "5.1.0"),
         .package(url: "https://github.com/sharplet/Regex.git", from: "2.1.1")
     ],
     targets: [

diff --git a/Utils/VersionBump/main.swift b/Utils/VersionBump/main.swift
@@ -27,11 +27,15 @@ for match in Regex(semver, options: [.dotMatchesLineSeparators]).allMatches(in:
     let toVersion = args[1]
 
     for file in files {
-        let readFile = try open(file)
-        let contents: String = readFile.read()
-        let newContents = contents.replacingOccurrences(of: fromVersion, with: toVersion)
-        let overwriteFile = try! open(forWriting: file, overwrite: true)
-        overwriteFile.write(newContents)
-        overwriteFile.close()
+        try updateVersion(file, fromVersion, toVersion)
     }
 }
+
+func updateVersion(_ file: String, _ fromVersion: String, _ toVersion: String) throws {
+    let readFile = try open(file)
+    let contents: String = readFile.read()
+    let newContents = contents.replacingOccurrences(of: fromVersion, with: toVersion)
+    let overwriteFile = try! open(forWriting: file, overwrite: true)
+    overwriteFile.write(newContents)
+    overwriteFile.close()
+}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -11,12 +11,40 @@ platform :ios do
   app_identifier = CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
   team_id = CredentialsManager::AppfileConfig.try_fetch_value(:team_id)
 
+  ioSwiftInfoPlistPath = "./Samples/iOS-Swift/iOS-Swift/Info.plist"
+
   lane :bump_bundle_version do
     set_info_plist_value(
-      path: "./Samples/iOS-Swift/iOS-Swift/Info.plist", 
+      path: ioSwiftInfoPlistPath, 
       key: "CFBundleVersion", 
       value: ENV["FASTLANE_BUNDLE_VERSION"]
     )
+
+  end
+
+  # The version for all Info.plist must be a period-separated list of at most three non-negative integers
+  # for App Store Connect. If we are on a preview we to remove these suffixes.
+  lane :remove_preview_version_suffixes do
+    version = get_version_number(xcodeproj: "./Samples/iOS-Swift/iOS-Swift.xcodeproj")
+    version = version.split("-", -1)[0]
+
+    set_info_plist_value(
+      path: ioSwiftInfoPlistPath, 
+      key: "CFBundleShortVersionString", 
+      value: version
+    )
+
+    sentryInfoPlistPath = "./Sources/Sentry/Info.plist"
+    set_info_plist_value(
+      path: sentryInfoPlistPath, 
+      key: "CFBundleShortVersionString", 
+      value: version
+    )
+    set_info_plist_value(
+      path: sentryInfoPlistPath, 
+      key: "CFBundleVersion", 
+      value: version
+    )
   end
 
   desc "Upload iOS-Swift to TestFlight and symbols to Sentry"
@@ -44,17 +72,23 @@ platform :ios do
 				provisioningProfiles: { 
 					app_identifier => "match AppStore io.sentry.sample.iOS-Swift"
 				}
-			}
+			},
+      archive_path: "iOS-Swift"
     )
 
     testflight
-    download_dsyms(wait_for_dsym_processing: true)
-    upload_symbols_to_sentry(
+
+    download_dsyms(
+      wait_for_dsym_processing: true,
+      build_number: ENV["FASTLANE_BUNDLE_VERSION"]
+    )
+
+    sentry_upload_dsym(
       auth_token: ENV["SENTRY_AUTH_TOKEN"],
       org_slug: 'sentry-sdks',
       project_slug: 'sentry-cocoa',
+      symbol_maps: 'iOS-Swift.xcarchive/BCSymbolMaps/'
     )
-    clean_build_artifacts
   end
 
 end
diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile
@@ -0,0 +1,5 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-sentry'