From 2cbdf1848105a63cbef6c22bbe50b991a3ae6af6 Mon Sep 17 00:00:00 2001 From: Serhii Mamontov Date: Sun, 4 Sep 2022 17:46:45 +0200 Subject: [PATCH 1/2] fix: example project reference to SDK Fix issue because of which `Example` project didn't built with missing `swift` reference error. Closes #113 fix: Carthage build issue with package schemas Fix issue because of which Carthage was unable to build caused by schemas without targets. Closes #112 --- Examples/Examples.xcodeproj/project.pbxproj | 66 +++++++--------- .../PubNubPackageDescription.xcscheme | 76 ------------------- .../xcschemes/PubNubPackageTests.xcscheme | 76 ------------------- 3 files changed, 29 insertions(+), 189 deletions(-) delete mode 100644 PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageDescription.xcscheme delete mode 100644 PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageTests.xcscheme diff --git a/Examples/Examples.xcodeproj/project.pbxproj b/Examples/Examples.xcodeproj/project.pbxproj index fe7d39ed..62c55337 100644 --- a/Examples/Examples.xcodeproj/project.pbxproj +++ b/Examples/Examples.xcodeproj/project.pbxproj @@ -7,10 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 35012EBE285007B400CF7E0A /* PubNubMembership in Frameworks */ = {isa = PBXBuildFile; productRef = 35012EBD285007B400CF7E0A /* PubNubMembership */; }; - 35012EC0285007B400CF7E0A /* PubNubSpace in Frameworks */ = {isa = PBXBuildFile; productRef = 35012EBF285007B400CF7E0A /* PubNubSpace */; }; - 35012EC2285007B400CF7E0A /* PubNubUser in Frameworks */ = {isa = PBXBuildFile; productRef = 35012EC1285007B400CF7E0A /* PubNubUser */; }; - 3503519C23EE2C6E006DFDC3 /* PubNub in Frameworks */ = {isa = PBXBuildFile; productRef = 3503519B23EE2C6E006DFDC3 /* PubNub */; }; 3567432822DF974600BF2639 /* MasterDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 359F779922B7FEF600B6B46F /* MasterDetailTableViewController.swift */; }; 357AD4EC252D067800099EB7 /* FileAPIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 357AD4EB252D067800099EB7 /* FileAPIViewController.swift */; }; 357AD4EE252D087800099EB7 /* FileAPI.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 357AD4ED252D087800099EB7 /* FileAPI.storyboard */; }; @@ -21,6 +17,10 @@ 359F779F22B7FEF700B6B46F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 359F779E22B7FEF700B6B46F /* Assets.xcassets */; }; 359F77A222B7FEF700B6B46F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 359F77A022B7FEF700B6B46F /* LaunchScreen.storyboard */; }; 35F0258F22BAC6C9007BD7D3 /* ConfigDetailTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35F0258E22BAC6C9007BD7D3 /* ConfigDetailTableViewController.swift */; }; + 792CF27228C4FBB300C83408 /* PubNub in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27128C4FBB300C83408 /* PubNub */; }; + 792CF27428C4FBB300C83408 /* PubNubMembership in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27328C4FBB300C83408 /* PubNubMembership */; }; + 792CF27628C4FBB300C83408 /* PubNubSpace in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27528C4FBB300C83408 /* PubNubSpace */; }; + 792CF27828C4FBB300C83408 /* PubNubUser in Frameworks */ = {isa = PBXBuildFile; productRef = 792CF27728C4FBB300C83408 /* PubNubUser */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -47,7 +47,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 35012EC3285009C400CF7E0A /* swift */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = swift; path = ..; sourceTree = ""; }; 35304F9022FF64D4006A02CA /* iOS Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "iOS Example.entitlements"; sourceTree = SOURCE_ROOT; }; 357AD4EB252D067800099EB7 /* FileAPIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileAPIViewController.swift; sourceTree = ""; }; 357AD4ED252D087800099EB7 /* FileAPI.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = FileAPI.storyboard; sourceTree = ""; }; @@ -62,6 +61,7 @@ 359F77A322B7FEF700B6B46F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 359F77AA22B7FF5700B6B46F /* PubNub.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PubNub.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 35F0258E22BAC6C9007BD7D3 /* ConfigDetailTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigDetailTableViewController.swift; sourceTree = ""; }; + 792CF27A28C4FCB800C83408 /* PubNub SDK */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "PubNub SDK"; path = ..; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,10 +69,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 35012EBE285007B400CF7E0A /* PubNubMembership in Frameworks */, - 35012EC2285007B400CF7E0A /* PubNubUser in Frameworks */, - 35012EC0285007B400CF7E0A /* PubNubSpace in Frameworks */, - 3503519C23EE2C6E006DFDC3 /* PubNub in Frameworks */, + 792CF27428C4FBB300C83408 /* PubNubMembership in Frameworks */, + 792CF27828C4FBB300C83408 /* PubNubUser in Frameworks */, + 792CF27628C4FBB300C83408 /* PubNubSpace in Frameworks */, + 792CF27228C4FBB300C83408 /* PubNub in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -93,7 +93,7 @@ 359F778B22B7FEF600B6B46F = { isa = PBXGroup; children = ( - 35012EC3285009C400CF7E0A /* swift */, + 792CF27928C4FCB800C83408 /* Packages */, 35F0258A22BAC173007BD7D3 /* Sources */, 359F779622B7FEF600B6B46F /* iOS Example */, 359F779522B7FEF600B6B46F /* Products */, @@ -149,6 +149,14 @@ path = Sources; sourceTree = ""; }; + 792CF27928C4FCB800C83408 /* Packages */ = { + isa = PBXGroup; + children = ( + 792CF27A28C4FCB800C83408 /* PubNub SDK */, + ); + name = Packages; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -168,10 +176,10 @@ ); name = "iOS Example"; packageProductDependencies = ( - 3503519B23EE2C6E006DFDC3 /* PubNub */, - 35012EBD285007B400CF7E0A /* PubNubMembership */, - 35012EBF285007B400CF7E0A /* PubNubSpace */, - 35012EC1285007B400CF7E0A /* PubNubUser */, + 792CF27128C4FBB300C83408 /* PubNub */, + 792CF27328C4FBB300C83408 /* PubNubMembership */, + 792CF27528C4FBB300C83408 /* PubNubSpace */, + 792CF27728C4FBB300C83408 /* PubNubUser */, ); productName = swiftSdkiOS; productReference = 359F779422B7FEF600B6B46F /* iOS Example.app */; @@ -207,7 +215,6 @@ ); mainGroup = 359F778B22B7FEF600B6B46F; packageReferences = ( - 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */, ); productRefGroup = 359F779522B7FEF600B6B46F /* Products */; projectDirPath = ""; @@ -455,38 +462,23 @@ }; /* End XCConfigurationList section */ -/* Begin XCRemoteSwiftPackageReference section */ - 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/pubnub/swift.git"; - requirement = { - branch = "features/CLEN-351_VSP-modules"; - kind = branch; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ - 35012EBD285007B400CF7E0A /* PubNubMembership */ = { + 792CF27128C4FBB300C83408 /* PubNub */ = { + isa = XCSwiftPackageProductDependency; + productName = PubNub; + }; + 792CF27328C4FBB300C83408 /* PubNubMembership */ = { isa = XCSwiftPackageProductDependency; - package = 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */; productName = PubNubMembership; }; - 35012EBF285007B400CF7E0A /* PubNubSpace */ = { + 792CF27528C4FBB300C83408 /* PubNubSpace */ = { isa = XCSwiftPackageProductDependency; - package = 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */; productName = PubNubSpace; }; - 35012EC1285007B400CF7E0A /* PubNubUser */ = { + 792CF27728C4FBB300C83408 /* PubNubUser */ = { isa = XCSwiftPackageProductDependency; - package = 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */; productName = PubNubUser; }; - 3503519B23EE2C6E006DFDC3 /* PubNub */ = { - isa = XCSwiftPackageProductDependency; - package = 3503519A23EE2C6E006DFDC3 /* XCRemoteSwiftPackageReference "swift" */; - productName = PubNub; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 359F778C22B7FEF600B6B46F /* Project object */; diff --git a/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageDescription.xcscheme b/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageDescription.xcscheme deleted file mode 100644 index 0b28ceaa..00000000 --- a/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageDescription.xcscheme +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageTests.xcscheme b/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageTests.xcscheme deleted file mode 100644 index 44aafa69..00000000 --- a/PubNub.xcodeproj/xcshareddata/xcschemes/PubNubPackageTests.xcscheme +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f9eceeed40e8f11e992736ebb7a712cab7edf085 Mon Sep 17 00:00:00 2001 From: Client Engineering Bot <60980775+client-engineering-bot@users.noreply.github.com> Date: Mon, 5 Sep 2022 08:52:17 +0000 Subject: [PATCH 2/2] PubNub SDK 6.0.1 release. --- .pubnub.yml | 11 +++++++++-- PubNub.xcodeproj/project.pbxproj | 16 ++++++++-------- PubNubSwift.podspec | 2 +- Sources/PubNub/Helpers/Constants.swift | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 6db72250..20236682 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,9 +1,16 @@ --- name: swift scm: github.com/pubnub/swift -version: "6.0.0" +version: "6.0.1" schema: 1 changelog: + - date: 2022-09-05 + version: 6.0.1 + changes: + - type: bug + text: "Fix issue because of which `Example` project didn't built with missing `swift` reference error." + - type: bug + text: "Fix issue because of which Carthage was unable to build caused by schemas without targets." - date: 2022-07-05 version: 6.0.0 changes: @@ -454,7 +461,7 @@ sdks: - distribution-type: source distribution-repository: GitHub release package-name: PubNub - location: https://github.com/pubnub/swift/archive/refs/tags/6.0.0.zip + location: https://github.com/pubnub/swift/archive/refs/tags/6.0.1.zip supported-platforms: supported-operating-systems: macOS: diff --git a/PubNub.xcodeproj/project.pbxproj b/PubNub.xcodeproj/project.pbxproj index 8e4c6b4c..a474b61b 100644 --- a/PubNub.xcodeproj/project.pbxproj +++ b/PubNub.xcodeproj/project.pbxproj @@ -3181,7 +3181,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubUser; @@ -3226,7 +3226,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubUser; @@ -3320,7 +3320,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubSpace; @@ -3367,7 +3367,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubSpace; @@ -3474,7 +3474,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubMembership; @@ -3520,7 +3520,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.pubnub.swift.PubNubMembership; @@ -3922,7 +3922,7 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -3955,7 +3955,7 @@ "$(inherited)", "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx", ); - MARKETING_VERSION = 6.0.0; + MARKETING_VERSION = 6.0.1; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited)"; diff --git a/PubNubSwift.podspec b/PubNubSwift.podspec index 0823f142..6ec362e6 100644 --- a/PubNubSwift.podspec +++ b/PubNubSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'PubNubSwift' - s.version = '6.0.0' + s.version = '6.0.1' s.homepage = 'https://github.com/pubnub/swift' s.documentation_url = 'https://www.pubnub.com/docs/swift-native/pubnub-swift-sdk' s.authors = { 'PubNub, Inc.' => 'support@pubnub.com' } diff --git a/Sources/PubNub/Helpers/Constants.swift b/Sources/PubNub/Helpers/Constants.swift index 7755399d..59d8e2fe 100644 --- a/Sources/PubNub/Helpers/Constants.swift +++ b/Sources/PubNub/Helpers/Constants.swift @@ -57,7 +57,7 @@ public enum Constant { static let pubnubSwiftSDKName: String = "PubNubSwift" - static let pubnubSwiftSDKVersion: String = "6.0.0" + static let pubnubSwiftSDKVersion: String = "6.0.1" static let appBundleId: String = { if let info = Bundle.main.infoDictionary,