Merge pull request #93 from backtrace-labs/release

Release 1.7.4-beta2

Author: konst-sauce

.github/workflows/deploy.yml

@@ -5,22 +5,50 @@ on:
     tags: '[0-9]+.[0-9]+.[0-9]+*'
 
 jobs:
-  build-cocoapods:
+  # test is copied pasted from test.yml - do in a clean way in the future
+  # BEGIN COPY PASTE FROM TEST.YML
+  test:
     runs-on: macos-latest
+    
+    strategy:
+      fail-fast: false
+      matrix:
+          platform: [ios, mac, tvos]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sh scripts/install.sh
+      - name: Run test
+        run: fastlane ${{ matrix.platform }} tests
+    
+  pod-lint:
+    runs-on: macos-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sh scripts/install.sh
+      - name: Run pod lib lint
+        run: pod lib lint --verbose --allow-warnings --sources='https://cdn.cocoapods.org/' 
+  # END COPY PASTE FROM TEST.YML
+  
+  deploy-cocoapods:
+    runs-on: macos-latest
+    needs: [pod-lint, test]
+    
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
         run: sh scripts/install.sh
-      - name: Run tests
-        run: sh scripts/test.sh
       - name: Deploy to Cocoapods
         run: sh scripts/deploy.sh
         env:
          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
 
   build-dynamic-frameworks:
     runs-on: macos-latest
-    needs: build-cocoapods
+    needs: [pod-lint, test]
 
     strategy:
       matrix:

.github/workflows/test.yml

@@ -15,6 +15,7 @@ jobs:
     runs-on: macos-latest
 
     strategy:
+      fail-fast: false
       matrix:
           platform: [ios, mac, tvos]
 

Backtrace-iOS/Backtrace.h

@@ -1,9 +1,3 @@
 #import <UIKit/UIKit.h>
 
-//! Project version number for Backtrace.
-FOUNDATION_EXPORT double BacktraceVersionNumber;
-
-//! Project version string for Backtrace.
-FOUNDATION_EXPORT const unsigned char BacktraceVersionString[];
-
 // In this header, you should import all the public headers of your framework using statements like #import <Backtrace/PublicHeader.h>

Backtrace-iOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Backtrace-iOSTests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>

Backtrace-macOS/Backtrace.h

@@ -1,10 +1,4 @@
 #import <Cocoa/Cocoa.h>
 
-//! Project version number for Backtrace.
-FOUNDATION_EXPORT double BacktraceVersionNumber;
-
-//! Project version string for Backtrace.
-FOUNDATION_EXPORT const unsigned char BacktraceVersionString[];
-
 // In this header, you should import all the public headers of your framework using statements like #import <Backtrace/PublicHeader.h>
 

Backtrace-macOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Backtrace-macOSTests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>

Backtrace-tvOS/Backtrace.h

@@ -1,9 +1,3 @@
 #import <UIKit/UIKit.h>
 
-//! Project version number for Backtrace.
-FOUNDATION_EXPORT double BacktraceVersionNumber;
-
-//! Project version string for Backtrace.
-FOUNDATION_EXPORT const unsigned char BacktraceVersionString[];
-
 // In this header, you should import all the public headers of your framework using statements like #import <Backtrace/PublicHeader.h>

Backtrace-tvOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>