Merge pull request #512 from dnzxy/extend-fastfile

Fix Browser Build for v5.1
JohanDegraeve · Mar 24, 2024 · 490a6cf · 490a6cf
2 parents 8410f68 + f8f46a7
commit 490a6cf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 56 deletions.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -56,8 +56,9 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.xdripswift",
-        "com.#{TEAMID}.xdripswift.xDrip4iOS-Widget",
-        "com.#{TEAMID}.xdripswift.watchkitapp"
+        "com.#{TEAMID}.xdripswift.xDripWidget",
+        "com.#{TEAMID}.xdripswift.watchkitapp",
+        "com.#{TEAMID}.xdripswift.watchkitapp.xDripWatchComplication"
       ]
     )
 
@@ -86,16 +87,23 @@ platform :ios do
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/xdrip.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}.xdripswift.xDrip4iOS-Widget"],
+      profile_name: mapping["com.#{TEAMID}.xdripswift.xDripWidget"],
       code_sign_identity: "iPhone Distribution",
-      targets: ["xDrip4iOS Widget"]
+      targets: ["xDrip Widget Extension"]
     )
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/xdrip.xcodeproj",
       profile_name: mapping["com.#{TEAMID}.xdripswift.watchkitapp"],
       code_sign_identity: "iPhone Distribution",
-      targets: ["Watch App"]
+      targets: ["xDrip Watch App"]
+    )
+
+    update_code_signing_settings(
+      path: "#{GITHUB_WORKSPACE}/xdrip.xcodeproj",
+      profile_name: mapping["com.#{TEAMID}.xdripswift.watchkitapp.xDripWatchComplication"],
+      code_sign_identity: "iPhone Distribution",
+      targets: ["xDrip Watch Complication Extension"]
     )
 
     gym(
@@ -153,11 +161,15 @@ platform :ios do
       Spaceship::ConnectAPI::BundleIdCapability::Type::NFC_TAG_READING
     ])
 
-    configure_bundle_id("xDrip4iOS Widget", "com.#{TEAMID}.xdripswift.xDrip4iOS-Widget", [
+    configure_bundle_id("xDrip Widget Extension", "com.#{TEAMID}.xdripswift.xDripWidget", [
+      Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
+    ])
+
+    configure_bundle_id("xDrip Watch App", "com.#{TEAMID}.xdripswift.watchkitapp", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
-    configure_bundle_id("Watch App", "com.#{TEAMID}.xdripswift.watchkitapp", [
+    configure_bundle_id("xDrip Watch Complication Extension", "com.#{TEAMID}.xdripswift.watchkitapp.xDripWatchComplication", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
@@ -181,8 +193,9 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.xdripswift",
-        "com.#{TEAMID}.xdripswift.xDrip4iOS-Widget",
-        "com.#{TEAMID}.xdripswift.watchkitapp"
+        "com.#{TEAMID}.xdripswift.xDripWidget",
+        "com.#{TEAMID}.xdripswift.watchkitapp",
+        "com.#{TEAMID}.xdripswift.watchkitapp.xDripWatchComplication"
       ]
     )
   end

diff --git a/fastlane/testflight.md b/fastlane/testflight.md
@@ -133,8 +133,9 @@ Note 2 - Depending on your build history, you may find some of the Identifiers a
 1. Go to [Certificates, Identifiers & Profiles](https://developer.apple.com/account/resources/identifiers/list) on the apple developer site.
 1. For each of the following identifier names:
     * xdripswift
-    * xdripswift xDrip4iOS-Widget
-    * Watch App
+    * xDrip Widget Extension
+    * xDrip Watch App
+    * xDrip Watch Complication Extension
 1. Click on the identifier's name.
 1. On the "App Groups" capabilies, click on the "Configure" button.
 1. Select the "Loop App Group" _(yes, "Loop App Group" is correct)_

diff --git a/xdrip-Bridging-Header-swift_2K9IH5TUSZLKY-clang_1I9XNFA44R9PL.pch b/xdrip-Bridging-Header-swift_2K9IH5TUSZLKY-clang_1I9XNFA44R9PL.pch
diff --git a/xdrip.xcodeproj/project.pbxproj b/xdrip.xcodeproj/project.pbxproj
@@ -5428,7 +5428,7 @@
 				CODE_SIGN_STYLE = "$(XDRIP_CODE_SIGN_STYLE)";
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEVELOPMENT_TEAM = "$(XDRIP_DEVELOPMENT_TEAM)";
-				INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
+				INFOPLIST_FILE = "xdrip/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5457,7 +5457,7 @@
 				CODE_SIGN_STYLE = "$(XDRIP_CODE_SIGN_STYLE)";
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEVELOPMENT_TEAM = "$(XDRIP_DEVELOPMENT_TEAM)";
-				INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
+				INFOPLIST_FILE = "xdrip/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/xdrip.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xdrip.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/xdrip.xcworkspace/xcshareddata/swiftpm/Package.resolved b/xdrip.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,4 @@
 {
-  "originHash" : "20a19467224593c1dcb0789843c73f4580a23d8227b26f5a2c54d6c62c75927e",
   "pins" : [
     {
       "identity" : "actionclosurable",
@@ -38,5 +37,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }