From 17081fb6325adfa62e8a0a7b782aa7b4fbe978b0 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Thu, 16 Mar 2023 18:40:15 -0300 Subject: [PATCH] Updated all versions to 3.0.0, minimum Swift version to v5 and iOS to 14 (#267) --- .gitmodules | 1 - Package.swift | 18 ++++++--- RollbarAUL.podspec | 4 +- RollbarAUL/Package.swift | 23 ++--------- RollbarCocoaLumberjack.podspec | 14 +++---- RollbarCocoaLumberjack/Package.swift | 19 ++------- RollbarCommon.podspec | 14 +++---- RollbarCommon/Package.swift | 8 ++-- RollbarDeploys.podspec | 12 +++--- RollbarDeploys/Package.swift | 27 ++----------- RollbarNotifier.podspec | 16 ++++---- RollbarNotifier/Package.swift | 8 ++-- .../RollbarNotifier/DTOs/RollbarConfig.m | 40 +++++++++---------- RollbarSwift.podspec | 14 +++---- RollbarSwift/Package.swift | 27 ++----------- UnitTesting/Package.swift | 22 ++-------- podpub.sh | 4 +- 17 files changed, 94 insertions(+), 177 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8b137891..00000000 --- a/.gitmodules +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Package.swift b/Package.swift index a2029103..7352a4d9 100644 --- a/Package.swift +++ b/Package.swift @@ -5,14 +5,14 @@ import PackageDescription let package = Package( name: "RollbarSDK", platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ .library(name: "RollbarCommon", targets: ["RollbarCommon"]), - .library(name: "RollbarNotifier", targets: ["RollbarNotifier"]), + .library(name: "RollbarNotifier", targets: ["RollbarNotifier", "RollbarCrashReport"]), .library(name: "RollbarSwift", targets: ["RollbarSwift"]), .library(name: "RollbarDeploys", targets: ["RollbarDeploys"]), .library(name: "RollbarAUL", targets: ["RollbarAUL"]), @@ -30,11 +30,19 @@ let package = Package( cSettings: [ .headerSearchPath("RollbarCommon/Sources/RollbarCommon/**"), ]), + .target( + name: "RollbarCrashReport", + dependencies: [ + "KSCrash", + ], + path: "RollbarNotifier/Sources/RollbarCrashReport" + ), .target( name: "RollbarNotifier", dependencies: [ "RollbarCommon", "KSCrash", + "RollbarCrashReport" ], path: "RollbarNotifier/Sources/RollbarNotifier", publicHeadersPath: "include", diff --git a/RollbarAUL.podspec b/RollbarAUL.podspec index a435fea8..f291050e 100644 --- a/RollbarAUL.podspec +++ b/RollbarAUL.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarAUL" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -19,7 +19,7 @@ Pod::Spec.new do |s| s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" + s.osx.deployment_target = "12.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarAUL/Package.swift b/RollbarAUL/Package.swift index 22e7b091..2adec3a6 100644 --- a/RollbarAUL/Package.swift +++ b/RollbarAUL/Package.swift @@ -1,42 +1,32 @@ // swift-tools-version:5.7.1 -// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "RollbarAUL", platforms: [ - // Oldest targeted platform versions that are supported by this product. - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "RollbarAUL", targets: ["RollbarAUL"]), ], dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), .package(path: "../RollbarCommon"), .package(path: "../RollbarNotifier"), .package(path: "../UnitTesting"), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "RollbarAUL", dependencies: ["RollbarCommon", "RollbarNotifier",], publicHeadersPath: "include", cSettings: [ .headerSearchPath("Sources/RollbarAUL/**"), -// .headerSearchPath("Sources/RollbarAUL/DTOs"), - -// .define("DEFINES_MODULE"), ] ), .testTarget( @@ -54,15 +44,10 @@ let package = Package( ], cSettings: [ .headerSearchPath("Tests/RollbarAULTests-ObjC/**"), -// .headerSearchPath("Sources/RollbarNotifier/DTOs"), - -// .define("DEFINES_MODULE"), ] ), ], swiftLanguageVersions: [ - SwiftVersion.v4, - SwiftVersion.v4_2, SwiftVersion.v5, ] ) diff --git a/RollbarCocoaLumberjack.podspec b/RollbarCocoaLumberjack.podspec index 8de6b292..0e406d06 100644 --- a/RollbarCocoaLumberjack.podspec +++ b/RollbarCocoaLumberjack.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarCocoaLumberjack" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -10,19 +10,17 @@ Pod::Spec.new do |s| DESC s.homepage = "https://rollbar.com" s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Rollbar" => "support@rollbar.com", - "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", - "Matias Pequeno" => "matias.pequeno@rollbar.com" } + s.authors = { "Rollbar" => "support@rollbar.com" } s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", :tag => "#{s.version}" } s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" - s.ios.deployment_target = "13.0" - s.tvos.deployment_target = "13.0" - s.watchos.deployment_target = "7.0" + s.osx.deployment_target = "12.0" + s.ios.deployment_target = "14.0" + s.tvos.deployment_target = "14.0" + s.watchos.deployment_target = "8.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarCocoaLumberjack/Package.swift b/RollbarCocoaLumberjack/Package.swift index 4be02d23..cd465c38 100644 --- a/RollbarCocoaLumberjack/Package.swift +++ b/RollbarCocoaLumberjack/Package.swift @@ -1,34 +1,27 @@ // swift-tools-version:5.7.1 -// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "RollbarCocoaLumberjack", platforms: [ - // Oldest targeted platform versions that are supported by this product. - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "RollbarCocoaLumberjack", targets: ["RollbarCocoaLumberjack"]), ], dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), .package(path: "../RollbarCommon"), .package(path: "../RollbarNotifier"), .package(path: "../UnitTesting"), .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.7.4"), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "RollbarCocoaLumberjack", dependencies: [ @@ -39,8 +32,6 @@ let package = Package( publicHeadersPath: "include", cSettings: [ .headerSearchPath("Sources/RollbarCocoaLumberjack/**"), - // .headerSearchPath("Sources/RollbarCocoaLumberjack/DTOs"), - // .define("DEFINES_MODULE"), ] ), .testTarget( @@ -64,8 +55,6 @@ let package = Package( ), ], swiftLanguageVersions: [ - SwiftVersion.v4, - SwiftVersion.v4_2, SwiftVersion.v5, ] ) diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index a1a64ad5..b4fa2d4c 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarCommon" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -10,19 +10,17 @@ Pod::Spec.new do |s| DESC s.homepage = "https://rollbar.com" s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Rollbar" => "support@rollbar.com", - "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", - "Matias Pequeno" => "matias.pequeno@rollbar.com" } + s.authors = { "Rollbar" => "support@rollbar.com" } s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", :tag => "#{s.version}" } s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" - s.ios.deployment_target = "13.0" - s.tvos.deployment_target = "13.0" - s.watchos.deployment_target = "7.0" + s.osx.deployment_target = "12.0" + s.ios.deployment_target = "14.0" + s.tvos.deployment_target = "14.0" + s.watchos.deployment_target = "8.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarCommon/Package.swift b/RollbarCommon/Package.swift index 2a96aea4..e8176e62 100644 --- a/RollbarCommon/Package.swift +++ b/RollbarCommon/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarCommon", platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ .library(name: "RollbarCommon", targets: ["RollbarCommon"]), diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index 4a7d17f8..d41f43f2 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarDeploys" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -10,18 +10,16 @@ Pod::Spec.new do |s| DESC s.homepage = "https://rollbar.com" s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Rollbar" => "support@rollbar.com", - "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", - "Matias Pequeno" => "matias.pequeno@rollbar.com" } + s.authors = { "Rollbar" => "support@rollbar.com" } s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", :tag => "#{s.version}" } s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" - s.ios.deployment_target = "13.0" - s.tvos.deployment_target = "13.0" + s.osx.deployment_target = "12.0" + s.ios.deployment_target = "14.0" + s.tvos.deployment_target = "14.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarDeploys/Package.swift b/RollbarDeploys/Package.swift index 798b7c62..3ad72888 100644 --- a/RollbarDeploys/Package.swift +++ b/RollbarDeploys/Package.swift @@ -1,43 +1,31 @@ // swift-tools-version:5.7.1 -// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "RollbarDeploys", platforms: [ - // Oldest targeted platform versions that are supported by this product. - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "RollbarDeploys", targets: ["RollbarDeploys"]), ], dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), .package(path: "../RollbarCommon"), .package(path: "../UnitTesting"), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "RollbarDeploys", dependencies: ["RollbarCommon",], publicHeadersPath: "include", cSettings: [ .headerSearchPath("Sources/RollbarDeploys/**"), -// .headerSearchPath("Sources/RollbarDeploys"), -// .headerSearchPath("Sources/RollbarDeploys/include"), -// .headerSearchPath("Sources/RollbarDeploys/DTOs"), - -// .define("DEFINES_MODULE"), ] ), .testTarget( @@ -55,17 +43,10 @@ let package = Package( ], cSettings: [ .headerSearchPath("Tests/RollbarDeploysTests-ObjC/**"), -// .headerSearchPath("Sources/RollbarDeploys"), -// .headerSearchPath("Sources/RollbarDeploys/include"), -// .headerSearchPath("Sources/RollbarDeploys/DTOs"), - -// .define("DEFINES_MODULE"), ] ), ], swiftLanguageVersions: [ - SwiftVersion.v4, - SwiftVersion.v4_2, SwiftVersion.v5, ] ) diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index 9b68b455..976df798 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarNotifier" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -10,19 +10,17 @@ Pod::Spec.new do |s| DESC s.homepage = "https://rollbar.com" s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Rollbar" => "support@rollbar.com", - "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", - "Matias Pequeno" => "matias.pequeno@rollbar.com" } + s.authors = { "Rollbar" => "support@rollbar.com" } s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", :tag => "#{s.version}" } s.documentation_url = "https://docs.rollbar.com/docs/apple" - s.social_media_url = "http://twitter.com/rollbar" + s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" - s.ios.deployment_target = "13.0" - s.tvos.deployment_target = "13.0" - s.watchos.deployment_target = "7.0" + s.osx.deployment_target = "12.0" + s.ios.deployment_target = "14.0" + s.tvos.deployment_target = "14.0" + s.watchos.deployment_target = "8.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarNotifier/Package.swift b/RollbarNotifier/Package.swift index fa95e3c1..a95b051d 100644 --- a/RollbarNotifier/Package.swift +++ b/RollbarNotifier/Package.swift @@ -5,10 +5,10 @@ import PackageDescription let package = Package( name: "RollbarNotifier", platforms: [ - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ .library(name: "RollbarNotifier", targets: ["RollbarNotifier", "RollbarCrashReport"]), diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m index 7f483928..6ed985c3 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m +++ b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m @@ -14,7 +14,7 @@ #pragma mark - constants -static NSString * const NOTIFIER_VERSION = @"2.4.0"; +static NSString * const NOTIFIER_VERSION = @"3.0.0"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; @@ -55,7 +55,7 @@ @implementation RollbarConfig #pragma mark - factory methods + (nonnull RollbarConfig *)configWithAccessToken:(nonnull NSString *)token { - + NSAssert(token, @"Access token must be initialized!"); NSAssert(token.length > 0, @"Access token must not be empty string!"); @@ -67,36 +67,36 @@ + (nonnull RollbarConfig *)configWithAccessToken:(nonnull NSString *)token { + (nonnull RollbarConfig *)configWithAccessToken:(nonnull NSString *)token environment:(nonnull NSString *)env { - + NSAssert(env, @"Environment must be initialized!"); NSAssert(env.length > 0, @"Environment must not be empty string!"); RollbarConfig *config = [[RollbarConfig alloc] initWithAccessToken:token environment:env]; - + return config; } + (nonnull RollbarMutableConfig *)mutableConfigWithAccessToken:(nonnull NSString *)token { - + NSAssert(token, @"Access token must be initialized!"); NSAssert(token.length > 0, @"Access token must not be empty string!"); - + RollbarMutableConfig *config = [[RollbarMutableConfig alloc] initWithAccessToken:token environment:nil]; - + return config; } + (nonnull RollbarMutableConfig *)mutableConfigWithAccessToken:(nonnull NSString *)token environment:(nonnull NSString *)env { - + NSAssert(env, @"Environment must be initialized!"); NSAssert(env.length > 0, @"Environment must not be empty string!"); - + RollbarMutableConfig *config = [[RollbarMutableConfig alloc] initWithAccessToken:token environment:env]; - + return config; } @@ -115,11 +115,11 @@ - (instancetype)initWithAccessToken:(nullable NSString *)token environment:(null else { destination = [[RollbarMutableDestination alloc] init]; } - + if (!destination) { return nil; } - + if (self = [super initWithDictionary:@{ DFK_DESTINATION:destination.jsonFriendlyData, DFK_DEVELOPER_OPTIONS:[RollbarDeveloperOptions new].jsonFriendlyData, @@ -133,15 +133,15 @@ - (instancetype)initWithAccessToken:(nullable NSString *)token environment:(null DFK_PERSON: [NSMutableDictionary new], DFK_CUSTOM: [NSMutableDictionary new] }]) { - + return self; } - + return nil; } - (instancetype)init { - + self = [super initWithDictionary:@{ DFK_DESTINATION:[RollbarDestination new].jsonFriendlyData, DFK_DEVELOPER_OPTIONS:[RollbarDeveloperOptions new].jsonFriendlyData, @@ -245,7 +245,7 @@ - (RollbarTelemetryOptions *)telemetry { #pragma mark - overrides - (nonnull RollbarMutableConfig *) mutableCopy { - + return [self mutableCopyWithZone:nil]; } @@ -261,7 +261,7 @@ - (nonnull RollbarMutableConfig *) mutableCopy { #pragma mark - NSCopying protocol -(id) copyWithZone: (NSZone *) zone { - + RollbarConfig *clone = [super copyWithZone:zone]; if (clone != self) { clone->_checkIgnoreRollbarData = self->_checkIgnoreRollbarData; @@ -273,7 +273,7 @@ -(id) copyWithZone: (NSZone *) zone { #pragma mark - NSMutableCopying protocol -(id) mutableCopyWithZone: (NSZone *) zone { - + RollbarConfig *clone = [super mutableCopyWithZone:zone]; if (clone != self) { clone->_checkIgnoreRollbarData = self->_checkIgnoreRollbarData; @@ -289,7 +289,7 @@ @implementation RollbarMutableConfig #pragma mark - initializers -(instancetype)init { - + if (self = [super init]) { return self; } @@ -460,7 +460,7 @@ - (void)setCustomData:(NSMutableDictionary *)value { #pragma mark - overrides - (nonnull RollbarConfig *) copy { - + return [self copyWithZone:nil]; } diff --git a/RollbarSwift.podspec b/RollbarSwift.podspec index 28c027c5..0e57bb31 100644 --- a/RollbarSwift.podspec +++ b/RollbarSwift.podspec @@ -1,5 +1,5 @@ Pod::Spec.new do |s| - s.version = "2.4.0" + s.version = "3.0.0" s.name = "RollbarSwift" s.summary = "Application or client side SDK for interacting with the Rollbar API Server." s.description = <<-DESC @@ -10,19 +10,17 @@ Pod::Spec.new do |s| DESC s.homepage = "https://rollbar.com" s.license = { :type => "MIT", :file => "LICENSE" } - s.authors = { "Rollbar" => "support@rollbar.com", - "Andrey Kornich (Wide Spectrum Computing LLC)" => "akornich@gmail.com", - "Matias Pequeno" => "matias.pequeno@rollbar.com" } + s.authors = { "Rollbar" => "support@rollbar.com" } s.source = { :git => "https://github.com/rollbar/rollbar-apple.git", :tag => "#{s.version}" } s.documentation_url = "https://docs.rollbar.com/docs/apple" s.social_media_url = "http://twitter.com/rollbar" s.resource = "rollbar-logo.png" - s.osx.deployment_target = "10.15" - s.ios.deployment_target = "13.0" - s.tvos.deployment_target = "13.0" - s.watchos.deployment_target = "7.0" + s.osx.deployment_target = "12.0" + s.ios.deployment_target = "14.0" + s.tvos.deployment_target = "14.0" + s.watchos.deployment_target = "8.0" s.source_files = "#{s.name}/Sources/#{s.name}/**/*.{h,m}" s.public_header_files = "#{s.name}/Sources/#{s.name}/include/*.h" diff --git a/RollbarSwift/Package.swift b/RollbarSwift/Package.swift index 260fbe22..032ed623 100644 --- a/RollbarSwift/Package.swift +++ b/RollbarSwift/Package.swift @@ -1,26 +1,21 @@ // swift-tools-version:5.7.1 -// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "RollbarSwift", platforms: [ - // Oldest targeted platform versions that are supported by this product. - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "RollbarSwift", targets: ["RollbarSwift"]), ], dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), .package(path: "../RollbarCommon"), .package(path: "../RollbarNotifier"), .package(name: "UnitTesting", @@ -28,19 +23,12 @@ let package = Package( ), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "RollbarSwift", dependencies: ["RollbarCommon", "RollbarNotifier",], publicHeadersPath: "include", cSettings: [ .headerSearchPath("Sources/RollbarSwift/**"), -// .headerSearchPath("Sources/RollbarSwift"), -// .headerSearchPath("Sources/RollbarSwift/include"), -// .headerSearchPath("Sources/RollbarSwift/DTOs"), - -// .define("DEFINES_MODULE"), ] ), .testTarget( @@ -55,17 +43,10 @@ let package = Package( dependencies: ["RollbarSwift"], cSettings: [ .headerSearchPath("Tests/RollbarSwiftTests-ObjC/**"), -// .headerSearchPath("Sources/RollbarNotifier"), -// .headerSearchPath("Sources/RollbarNotifier/include"), -// .headerSearchPath("Sources/RollbarNotifier/DTOs"), - -// .define("DEFINES_MODULE"), ] ), ], swiftLanguageVersions: [ - SwiftVersion.v4, - SwiftVersion.v4_2, SwiftVersion.v5, ] ) diff --git a/UnitTesting/Package.swift b/UnitTesting/Package.swift index e9fc23f2..eeb36eac 100644 --- a/UnitTesting/Package.swift +++ b/UnitTesting/Package.swift @@ -1,31 +1,24 @@ // swift-tools-version:5.7.1 -// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "UnitTesting", platforms: [ - // Oldest targeted platform versions that are supported by this product. - .macOS(.v10_15), - .iOS(.v13), - .tvOS(.v13), - .watchOS(.v7), + .macOS(.v12), + .iOS(.v14), + .tvOS(.v14), + .watchOS(.v8), ], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "UnitTesting", targets: ["UnitTesting"]), ], dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), .package(path: "../RollbarCommon"), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "UnitTesting", dependencies: [ @@ -34,11 +27,6 @@ let package = Package( publicHeadersPath: "include", cSettings: [ .headerSearchPath("Sources/UnitTesting/**"), - // .headerSearchPath("Sources/RollbarNotifier"), - // .headerSearchPath("Sources/RollbarNotifier/include"), - // .headerSearchPath("Sources/RollbarNotifier/DTOs"), - - // .define("DEFINES_MODULE"), ] ), .testTarget( @@ -46,8 +34,6 @@ let package = Package( dependencies: ["UnitTesting"]), ], swiftLanguageVersions: [ - SwiftVersion.v4, - SwiftVersion.v4_2, SwiftVersion.v5, ] ) diff --git a/podpub.sh b/podpub.sh index 19607ae4..c4d113fc 100755 --- a/podpub.sh +++ b/podpub.sh @@ -2,9 +2,7 @@ shopt -s nullglob set -e -declare -a PODSPECS=(RollbarCommon RollbarNotifier RollbarDeploys RollbarAUL - RollbarSwift RollbarKSCrash RollbarPLCrashReporter - RollbarCocoaLumberjack) +declare -a PODSPECS=(RollbarCommon RollbarNotifier RollbarSwift RollbarDeploys RollbarAUL RollbarCocoaLumberjack) declare -a OPTIONS=() function help {