Merge pull request #286 from LoopKit/hotfix/add_identifiers

main branch: Use a special version of fastlane to enable Add Identifiers

Author: marionbarker

Gemfile

@@ -1,3 +1,6 @@
 source"https://rubygems.org"
 
-gem"fastlane"
+# gem "fastlane"
+
+# This branch uses fastlane 2.228.0 plus pr 29596
+gem"fastlane",git: "https://github.com/loopandlearn/fastlane.git",ref: "a670d4b092b274d58ebb5497126e47fc6a84f533"

Gemfile.lock

@@ -1,3 +1,51 @@
+GIT
+remote:https://github.com/loopandlearn/fastlane.git
+revision:a670d4b092b274d58ebb5497126e47fc6a84f533
+ref:a670d4b092b274d58ebb5497126e47fc6a84f533
+specs:
+fastlane (2.228.0)
+CFPropertyList (>=2.3, <4.0.0)
+addressable (>=2.8, <3.0.0)
+artifactory (~>3.0)
+aws-sdk-s3 (~>1.0)
+babosa (>=1.0.3, <2.0.0)
+bundler (>=1.12.0, <3.0.0)
+colored (~>1.2)
+commander (~>4.6)
+dotenv (>=2.1.1, <3.0.0)
+emoji_regex (>=0.1, <4.0)
+excon (>=0.71.0, <1.0.0)
+faraday (~>1.0)
+faraday-cookie_jar (~>0.0.6)
+faraday_middleware (~>1.0)
+fastimage (>=2.1.0, <3.0.0)
+fastlane-sirp (>=1.0.0)
+gh_inspector (>=1.1.2, <2.0.0)
+google-apis-androidpublisher_v3 (~>0.3)
+google-apis-playcustomapp_v1 (~>0.1)
+google-cloud-env (>=1.6.0, <2.0.0)
+google-cloud-storage (~>1.31)
+highline (~>2.0)
+http-cookie (~>1.0.5)
+json (<3.0.0)
+jwt (>=2.1.0, <3)
+mini_magick (>=4.9.4, <5.0.0)
+multipart-post (>=2.0.0, <3.0.0)
+naturally (~>2.2)
+optparse (>=0.1.1, <1.0.0)
+plist (>=3.1.0, <4.0.0)
+rubyzip (>=2.0.0, <3.0.0)
+security (=0.1.5)
+simctl (~>1.6.3)
+terminal-notifier (>=2.0.0, <3.0.0)
+terminal-table (~>3)
+tty-screen (>=0.6.3, <1.0.0)
+tty-spinner (>=0.8.0, <1.0.0)
+word_wrap (~>1.0.0)
+xcodeproj (>=1.13.0, <2.0.0)
+xcpretty (~>0.4.1)
+xcpretty-travis-formatter (>=0.0.3, <2.0.0)
+
 GEM
 remote:https://rubygems.org/
 specs:
@@ -10,15 +58,15 @@ GEM
 artifactory (3.0.17)
 atomos (0.1.3)
 aws-eventstream (1.4.0)
-aws-partitions (1.1115.0)
+aws-partitions (1.1116.0)
 aws-sdk-core (3.225.2)
 aws-eventstream (~>1, >=1.3.0)
 aws-partitions (~>1, >=1.992.0)
 aws-sigv4 (~>1.9)
 base64
 jmespath (~>1, >=1.6.1)
 logger
-aws-sdk-kms (1.104.0)
+aws-sdk-kms (1.105.0)
 aws-sdk-core (~>3, >=3.225.0)
 aws-sigv4 (~>1.5)
 aws-sdk-s3 (1.189.1)
@@ -70,48 +118,6 @@ GEM
 faraday_middleware (1.2.1)
 faraday (~>1.0)
 fastimage (2.4.0)
-fastlane (2.228.0)
-CFPropertyList (>=2.3, <4.0.0)
-addressable (>=2.8, <3.0.0)
-artifactory (~>3.0)
-aws-sdk-s3 (~>1.0)
-babosa (>=1.0.3, <2.0.0)
-bundler (>=1.12.0, <3.0.0)
-colored (~>1.2)
-commander (~>4.6)
-dotenv (>=2.1.1, <3.0.0)
-emoji_regex (>=0.1, <4.0)
-excon (>=0.71.0, <1.0.0)
-faraday (~>1.0)
-faraday-cookie_jar (~>0.0.6)
-faraday_middleware (~>1.0)
-fastimage (>=2.1.0, <3.0.0)
-fastlane-sirp (>=1.0.0)
-gh_inspector (>=1.1.2, <2.0.0)
-google-apis-androidpublisher_v3 (~>0.3)
-google-apis-playcustomapp_v1 (~>0.1)
-google-cloud-env (>=1.6.0, <2.0.0)
-google-cloud-storage (~>1.31)
-highline (~>2.0)
-http-cookie (~>1.0.5)
-json (<3.0.0)
-jwt (>=2.1.0, <3)
-mini_magick (>=4.9.4, <5.0.0)
-multipart-post (>=2.0.0, <3.0.0)
-naturally (~>2.2)
-optparse (>=0.1.1, <1.0.0)
-plist (>=3.1.0, <4.0.0)
-rubyzip (>=2.0.0, <3.0.0)
-security (=0.1.5)
-simctl (~>1.6.3)
-terminal-notifier (>=2.0.0, <3.0.0)
-terminal-table (~>3)
-tty-screen (>=0.6.3, <1.0.0)
-tty-spinner (>=0.8.0, <1.0.0)
-word_wrap (~>1.0.0)
-xcodeproj (>=1.13.0, <2.0.0)
-xcpretty (~>0.4.1)
-xcpretty-travis-formatter (>=0.0.3, <2.0.0)
 fastlane-sirp (1.0.0)
 sysrandom (~>1.0)
 gh_inspector (1.1.3)
@@ -167,7 +173,7 @@ GEM
 multipart-post (2.4.1)
 mutex_m (0.3.0)
 nanaimo (0.4.0)
-naturally (2.2.2)
+naturally (2.3.0)
 nkf (0.2.0)
 optparse (0.6.0)
 os (1.1.4)
@@ -226,7 +232,7 @@ PLATFORMS
 x86_64-linux
 
 DEPENDENCIES
-fastlane
+fastlane!
 
 BUNDLED WITH
 2.6.2

VersionOverride.xcconfig

@@ -8,5 +8,5 @@
 
 // Version [for DIY Loop]
 // configure the version number in LoopWorkspace
-LOOP_MARKETING_VERSION = 3.6.1
+LOOP_MARKETING_VERSION = 3.6.2
 CURRENT_PROJECT_VERSION = 57

fastlane/Fastfile

@@ -171,18 +171,22 @@ platform :ios do
 )
 
 defconfigure_bundle_id(name,identifier,capabilities)
-bundle_id=Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(name: name,identifier: identifier)
-capabilities.each{ |capability|
-bundle_id.create_capability(capability)
-}
+bundle_id=Spaceship::ConnectAPI::BundleId.find(identifier) || Spaceship::ConnectAPI::BundleId.create(
+name: name,
+identifier: identifier,
+platform: "IOS"
+)
+existing=bundle_id.get_capabilities.map(&:capability_type)
+capabilities.reject{ |c| existing.include?(c)}.eachdo |cap|
+bundle_id.create_capability(cap)
+end
 end
 
 configure_bundle_id("Loop","com.#{TEAMID}.loopkit.Loop",[
 Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
 Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT,
 Spaceship::ConnectAPI::BundleIdCapability::Type::PUSH_NOTIFICATIONS,
 Spaceship::ConnectAPI::BundleIdCapability::Type::SIRIKIT,
-Spaceship::ConnectAPI::BundleIdCapability::Type::USERNOTIFICATIONS_TIMESENSITIVE,
 Spaceship::ConnectAPI::BundleIdCapability::Type::NFC_TAG_READING
 ])