From 78a50581da7547c120cb08f45c82d839ffd0e9f2 Mon Sep 17 00:00:00 2001 From: Lennert Date: Tue, 5 Jul 2022 12:48:53 +0200 Subject: [PATCH 1/2] IOS thingies --- .../ConfigurationProxy.swift | 2 +- app/ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/ios/Runner Network Extension/ConfigurationProxy.swift b/app/ios/Runner Network Extension/ConfigurationProxy.swift index 3aac9229c..508f085e8 100644 --- a/app/ios/Runner Network Extension/ConfigurationProxy.swift +++ b/app/ios/Runner Network Extension/ConfigurationProxy.swift @@ -124,7 +124,7 @@ class ConfigurationProxy { self.fix() if let data = self.data() { let providerProtocol = NETunnelProviderProtocol() - providerProtocol.providerBundleIdentifier = "org.jimber.threebotlogin.staging.extension" + providerProtocol.providerBundleIdentifier = "org.jimber.threebot.extension" providerProtocol.providerConfiguration = [ "json": data ] providerProtocol.serverAddress = "yggdrasil" providerProtocol.username = self.get("EncryptionPublicKey") as? String ?? "(unknown public key)" diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index 61b8bd9fb..a601ed0ac 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -497,7 +497,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -531,7 +531,7 @@ ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging.extension; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.extension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -566,7 +566,7 @@ "@executable_path/../../Frameworks", ); MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging.extension; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.extension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -599,7 +599,7 @@ "@executable_path/../../Frameworks", ); MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging.extension; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.extension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -744,7 +744,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -779,7 +779,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebotlogin.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; From 5900d01776f7a0fa811b731f52de9a756e3c42e6 Mon Sep 17 00:00:00 2001 From: Lennert Date: Tue, 5 Jul 2022 17:35:17 +0200 Subject: [PATCH 2/2] IOS --- .../Runner_Network_Extension.entitlements | 2 +- app/ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/ios/Runner Network Extension/Runner_Network_Extension.entitlements b/app/ios/Runner Network Extension/Runner_Network_Extension.entitlements index ef548fd28..761a8857a 100644 --- a/app/ios/Runner Network Extension/Runner_Network_Extension.entitlements +++ b/app/ios/Runner Network Extension/Runner_Network_Extension.entitlements @@ -12,7 +12,7 @@ com.apple.security.application-groups - group.org.jimber.threebotlogin.staging + group.org.jimber.threebot diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index a601ed0ac..3faca32a6 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -479,7 +479,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 162; + CURRENT_PROJECT_VERSION = 163; DEVELOPMENT_TEAM = 5KWG4UBB25; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -497,7 +497,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -726,7 +726,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 162; + CURRENT_PROJECT_VERSION = 163; DEVELOPMENT_TEAM = 5KWG4UBB25; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -744,7 +744,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -761,7 +761,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 162; + CURRENT_PROJECT_VERSION = 163; DEVELOPMENT_TEAM = 5KWG4UBB25; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -779,7 +779,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 3.7.0; - PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot.staging; + PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0;