Skip to content

Commit

Permalink
Updated all versions to 3.0.0, minimum Swift version to v5 and iOS to…
Browse files Browse the repository at this point in the history 
… 14 (#267)
  • Loading branch information
@matux
matux authored Mar 16, 2023
1 parent 744b53f commit 17081fb
Show file tree
Hide file tree
Showing 17 changed files with 94 additions and 177 deletions.
1 change: 0 additions & 1 deletion .gitmodules
View file

This file was deleted.

18 changes: 13 additions & 5 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions RollbarAUL.podspec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
23 changes: 4 additions & 19 deletions RollbarAUL/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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,
]
)
14 changes: 6 additions & 8 deletions RollbarCocoaLumberjack.podspec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
19 changes: 4 additions & 15 deletions RollbarCocoaLumberjack/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -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: [
Expand All @@ -39,8 +32,6 @@ let package = Package(
publicHeadersPath: "include",
cSettings: [
.headerSearchPath("Sources/RollbarCocoaLumberjack/**"),
// .headerSearchPath("Sources/RollbarCocoaLumberjack/DTOs"),
// .define("DEFINES_MODULE"),
]
),
.testTarget(
Expand All @@ -64,8 +55,6 @@ let package = Package(
),
],
swiftLanguageVersions: [
SwiftVersion.v4,
SwiftVersion.v4_2,
SwiftVersion.v5,
]
)
14 changes: 6 additions & 8 deletions RollbarCommon.podspec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions RollbarCommon/Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand Down
12 changes: 5 additions & 7 deletions RollbarDeploys.podspec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
27 changes: 4 additions & 23 deletions RollbarDeploys/Package.swift
View file
Original file line number Diff line number Diff line change
@@ -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(
Expand All @@ -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,
]
)
16 changes: 7 additions & 9 deletions RollbarNotifier.podspec
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
Loading

0 comments on commit 17081fb

Please sign in to comment.