Merge pull request #323 from KlubJagiellonski/release/2.0.1

Release: 2.0.1

BuyPolish/NotificationServiceExtension/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0.1</string>
+	<key>CFBundleVersion</key>
+	<string>77</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

BuyPolish/Podfile

@@ -4,35 +4,40 @@ platform :ios, '11.0'
 inhibit_all_warnings!
 use_frameworks!
 
-target :NotificationServiceExtension do
+def firebase_pods
+  pod 'Firebase/Analytics'
+  pod 'Firebase/Crashlytics'
+  pod 'Firebase/Performance'
   pod 'Firebase/Messaging'
 end
 
 target :Pola do
-    pod 'Firebase/Analytics'
-    pod 'Firebase/Crashlytics'
-    pod 'Firebase/Performance'
-    pod 'Firebase/Messaging'
-    pod 'UITextView+Placeholder'
-    pod 'KVNProgress'
-    pod 'R.swift'
-    pod 'Alamofire'
-    pod 'Swinject'
-    pod 'PromiseKit/Alamofire'
-    pod 'Observable'
-
-    target :PolaTests do
-      pod 'SnapshotTesting'
-      pod 'DataDrivenTesting'
-    end
+
+  firebase_pods
+  pod 'UITextView+Placeholder'
+  pod 'KVNProgress'
+  pod 'R.swift'
+  pod 'Alamofire'
+  pod 'Swinject'
+  pod 'PromiseKit/Alamofire'
+  pod 'Observable'
+
+  target :PolaTests do
+    pod 'SnapshotTesting'
+    pod 'DataDrivenTesting'
+  end
 
-    target :PolaUITests do
-      pod 'Swifter'
-      pod 'SnapshotTesting'
-    end
+  target :PolaUITests do
+    pod 'Swifter'
+    pod 'SnapshotTesting'
+  end
 
 end
 
+target :NotificationServiceExtension do
+  firebase_pods
+end
+
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|

BuyPolish/Podfile.lock

@@ -224,6 +224,6 @@ SPEC CHECKSUMS:
   Swinject: ddf78b8486dd9b71a667b852cad919ab4484478e
   "UITextView+Placeholder": d7b0c400921f66523f3a85d74f774512e14f6502
 
-PODFILE CHECKSUM: e9bdf3db43420968e548bb102a892504e8585d81
+PODFILE CHECKSUM: 083e0cfbba36b948315bc422aca5ac67f8e9a04e
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.11.3

BuyPolish/Pola.xcodeproj/xcshareddata/xcschemes/Pola.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1420"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

BuyPolish/Pola.xcodeproj/xcshareddata/xcschemes/PolaUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1420"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

BuyPolish/Pola/SupportingFiles/Pola-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>73</string>
+	<string>77</string>
 	<key>GOOGLE_ANALYTICS_REGISTRATION_WITH_AD_NETWORK_ENABLED</key>
 	<false/>
 	<key>ITSAppUsesNonExemptEncryption</key>

BuyPolish/fastlane/Fastfile_bump_version.rb

@@ -14,24 +14,35 @@
 
       increment_version_number_in_plist(
         version_number: version,
-        target: App_sheme
+        target: App_target
       )
       build_number = increment_build_number_in_plist(
-        target: App_sheme
+        target: App_target
+      )
+
+      increment_version_number_in_plist(
+        version_number: version,
+        target: Notification_extension_target
+      )
+
+      increment_build_number_in_plist(
+        build_number: build_number,
+        target: Notification_extension_target
       )
 
       snapshot_path = "PolaUITests/Tests/__Snapshots__/InformationPageUITests/testOpenInformationPage.1.png"
       delete_files(file_pattern:snapshot_path)
       scan(
-        scheme: App_sheme,
+        scheme: App_target,
         testplan: "BumpVersion",
         fail_build: false
       )
 
-      plist_path = "Pola/SupportingFiles/Pola-Info.plist"
+      app_plist_path = "Pola/SupportingFiles/Pola-Info.plist"
+      service_plist_path = "NotificationServiceExtension/Info.plist"
       commit_and_push_if_ci(
         message: "Bump version to #{version} build number to #{build_number}",
-        path: [plist_path, snapshot_path]
+        path: [app_plist_path, service_plist_path, snapshot_path]
       )
 
     end

BuyPolish/fastlane/Matchfile

@@ -1,3 +1,4 @@
-app_identifier "com.kj.Pola"
+app_identifier ["com.kj.Pola", "com.kj.Pola.NotificationServiceExtension"]
 git_url "[email protected]:KlubJagiellonski/ios_certificates.git"
-type "appstore"
+type "appstore"
+team_id "9NBWKG2G3X"

BuyPolish/fastlane/shared_constants.rb

@@ -1,2 +1,4 @@
 
-App_sheme = "Pola"
+App_target = "Pola"
+
+Notification_extension_target = "NotificationServiceExtension"