From dbdd4a969679811ca4093badd2daf4dd7cc934b2 Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 28 Sep 2022 23:10:32 +0900 Subject: [PATCH 01/12] update SPM: add RUNAOMSDK target --- Package.swift | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/Package.swift b/Package.swift index 86d9624..fd87756 100644 --- a/Package.swift +++ b/Package.swift @@ -8,30 +8,46 @@ let package = Package( platforms: [.iOS(.v10)], products: [ .library( - name: "RUNA", + name: "RUNABanner", targets: [ - "RUNACore", - "RUNABanner", - "RUNAOMAdapter", + "Banner", ] - ) + ), + .library( + name: "RUNAOMAdapter", + targets: [ + "OMAdapter", + ] + ), ], dependencies: [], targets: [ .binaryTarget( - name: "RUNACore", + name: "Core", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNACore/RUNACore_iOS_1.4.5.xcframework.zip", checksum : "14a04c8daf65595004027ae830c09c70a1fc6e63995ae2f3b5b149786ed8eba0" ), .binaryTarget( - name: "RUNABanner", + name: "Banner", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.1.xcframework.zip", - checksum : "db1d699ecd2239e537ba2372fecf98783c2d8a84e83f0b00193a38ae5a793db1" + checksum : "db1d699ecd2239e537ba2372fecf98783c2d8a84e83f0b00193a38ae5a793db1", + dependencies: [ + "Core" + ] ), .binaryTarget( - name: "RUNAOMAdapter", + name: "OMAdapter", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.7.xcframework.zip", - checksum : "3e8ef20acf3ed3514e25130a7b689ea5f66eb1d9cdd608e697597dca950c5c3e" + checksum : "3e8ef20acf3ed3514e25130a7b689ea5f66eb1d9cdd608e697597dca950c5c3e", + dependencies: [ + "Banner", + "OMSDK", + ] + ), + .binaryTarget( + name: "OMSDK", + url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMSDK/RUNAOMSDK_iOS_1.3.31.xcframework.zip", + checksum : "9f5e075651c1c254f6016dd9bc2e8d8e45d6ba2843f8d4c4299e6de6446b31ed" ), ] ) From 21e7651e0884c54368be97b13bdb3b763bb6a8c7 Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 28 Sep 2022 23:40:36 +0900 Subject: [PATCH 02/12] [Update] RUNACore (1.4.6) --- RUNACore/1.4.6/RUNACore.podspec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 RUNACore/1.4.6/RUNACore.podspec diff --git a/RUNACore/1.4.6/RUNACore.podspec b/RUNACore/1.4.6/RUNACore.podspec new file mode 100644 index 0000000..6219bf2 --- /dev/null +++ b/RUNACore/1.4.6/RUNACore.podspec @@ -0,0 +1,31 @@ +# +# Be sure to run `pod spec lint RUNACore.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.name = "RUNACore" + s.version = "1.4.6" + s.summary = "Podspec file of #{s.name} iOS SDK." + s.description = <<-DESC +This repository is used to distribute #{s.name} iOS SDK for CocoaPods users. + DESC + s.homepage = "https://github.com/rakuten-ads/Rakuten-Ads-iOS" + s.license = { + :type => "Copyright", + :text => "Copyright © Rakuten, inc. All Rights Reserved." + } + s.author = "Rakuten" + s.platform = :ios, "10.0" + s.source = { + :http => "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/#{s.name}/#{s.name}_iOS_#{s.version}.xcframework.zip" + } + s.vendored_frameworks = "#{s.name}.xcframework" + + s.frameworks = "Foundation", "AdSupport", "SystemConfiguration", "WebKit", "UIKit", "Network" + +end From 7d3d863c2ac53d5e174e02858b4d5ec8f1ef8ded Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 28 Sep 2022 23:41:06 +0900 Subject: [PATCH 03/12] [Update] RUNABanner (1.9.2) --- RUNABanner/1.9.2/RUNABanner.podspec | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 RUNABanner/1.9.2/RUNABanner.podspec diff --git a/RUNABanner/1.9.2/RUNABanner.podspec b/RUNABanner/1.9.2/RUNABanner.podspec new file mode 100644 index 0000000..d92168f --- /dev/null +++ b/RUNABanner/1.9.2/RUNABanner.podspec @@ -0,0 +1,32 @@ +# +# Be sure to run `pod spec lint RUNA.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.name = "RUNABanner" + s.version = "1.9.2" + s.summary = "Podspec file of #{s.name} iOS SDK." + s.description = <<-DESC +This repository is used to distribute #{s.name} iOS SDK for CocoaPods users. + DESC + s.homepage = "https://github.com/rakuten-ads/Rakuten-Ads-iOS" + s.license = { + :type => "Copyright", + :text => "Copyright © Rakuten, inc. All Rights Reserved." + } + s.author = "Rakuten" + s.platform = :ios, "10.0" + s.source = { + :http => "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/#{s.name}/#{s.name}_iOS_#{s.version}.xcframework.zip" + } + s.vendored_frameworks = "#{s.name}.xcframework" + + s.frameworks = "Foundation", "AdSupport", "SystemConfiguration", "WebKit", "UIKit" + s.dependency 'RUNACore', '~> 1.4' + +end From 160155c9714480386a38da5f09a313efc87e05ac Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 28 Sep 2022 23:43:11 +0900 Subject: [PATCH 04/12] [Add] RUNAOMSDK (1.3.31) --- RUNAOMSDK/1.3.31/RUNAOMSDK.podspec | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 RUNAOMSDK/1.3.31/RUNAOMSDK.podspec diff --git a/RUNAOMSDK/1.3.31/RUNAOMSDK.podspec b/RUNAOMSDK/1.3.31/RUNAOMSDK.podspec new file mode 100644 index 0000000..aab1eef --- /dev/null +++ b/RUNAOMSDK/1.3.31/RUNAOMSDK.podspec @@ -0,0 +1,31 @@ +# +# Be sure to run `pod spec lint RUNACore.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.name = "RUNAOMSDK" + s.version = "1.3.31" + s.summary = "Podspec file of #{s.name} iOS SDK." + s.description = <<-DESC +This repository is used to distribute #{s.name} iOS SDK for CocoaPods users. + DESC + s.homepage = "https://github.com/rakuten-ads/Rakuten-Ads-iOS" + s.license = { + :type => "Copyright", + :text => "Copyright © Rakuten, inc. All Rights Reserved." + } + s.author = "Rakuten" + s.platform = :ios, "10.0" + s.source = { + :http => "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/#{s.name}/#{s.name}_iOS_#{s.version}.xcframework.zip" + } + s.vendored_frameworks = "OMSDK_Rakuten.xcframework" + + s.frameworks = "Foundation", "UIKit" + +end From be33f1ff484773ebc1f6abd73cc155832fcf7efd Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 28 Sep 2022 23:51:15 +0900 Subject: [PATCH 05/12] [Update] RUNAOMAdapter (1.0.8) --- RUNAOMAdapter/1.0.8/RUNAOMAdapter.podspec | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 RUNAOMAdapter/1.0.8/RUNAOMAdapter.podspec diff --git a/RUNAOMAdapter/1.0.8/RUNAOMAdapter.podspec b/RUNAOMAdapter/1.0.8/RUNAOMAdapter.podspec new file mode 100644 index 0000000..e21c37b --- /dev/null +++ b/RUNAOMAdapter/1.0.8/RUNAOMAdapter.podspec @@ -0,0 +1,33 @@ +# +# Be sure to run `pod spec lint RUNA.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.name = "RUNAOMAdapter" + s.version = "1.0.8" + s.summary = "Podspec file of #{s.name} iOS SDK." + s.description = <<-DESC +This repository is used to distribute #{s.name} iOS SDK for CocoaPods users. + DESC + s.homepage = "https://github.com/rakuten-ads/Rakuten-Ads-iOS" + s.license = { + :type => "Copyright", + :text => "Copyright © Rakuten, inc. All Rights Reserved." + } + s.author = "Rakuten" + s.platform = :ios, "10.0" + s.source = { + :http => "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/#{s.name}/#{s.name}_iOS_#{s.version}.xcframework.zip" + } + s.vendored_frameworks = "#{s.name}.xcframework" + + s.frameworks = "Foundation", "AdSupport", "SystemConfiguration", "WebKit", "UIKit" + s.dependency 'RUNABanner', '~> 1.9' + s.dependency 'RUNAOMSDK', '~> 1.3' + +end From 5fa5e88a55d5ad4150aa28bb425f61ac72a1aeae Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:02:32 +0900 Subject: [PATCH 06/12] [Update] RUNA (1.10.2) --- RUNA/1.10.2/RUNA.podspec | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 RUNA/1.10.2/RUNA.podspec diff --git a/RUNA/1.10.2/RUNA.podspec b/RUNA/1.10.2/RUNA.podspec new file mode 100644 index 0000000..d1dd666 --- /dev/null +++ b/RUNA/1.10.2/RUNA.podspec @@ -0,0 +1,49 @@ +# +# Be sure to run `pod spec lint RUNA.podspec' to ensure this is a +# valid spec and to remove all comments including this before submitting the spec. +# +# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html +# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/ +# + +Pod::Spec.new do |s| + + s.name = "RUNA" + s.version = "1.10.2" + s.summary = "Podspec file of #{s.name} iOS SDK." + s.description = <<-DESC +This repository is used to distribute #{s.name} iOS SDK for CocoaPods users. + DESC + s.homepage = "https://github.com/rakuten-ads/Rakuten-Ads-iOS" + s.license = { + :type => "Copyright", + :text => "Copyright © Rakuten, inc. All Rights Reserved." + } + s.author = "Rakuten" + s.platform = :ios, "10.0" + s.source = { + :git => "https://github.com/rakuten-ads/Rakuten-Ads-iOS.git" + } + + s.default_subspec = 'Banner' + + s.subspec 'CoreOnly' do |ss| + ss.ios.dependency 'RUNACore', '1.4.6' + end + + s.subspec 'Banner' do |ss| + ss.dependency 'RUNA/CoreOnly' + ss.ios.dependency 'RUNABanner', '1.9.2' + end + + s.subspec 'OMSDK' do |ss| + ss.ios.dependency 'RUNAOMSDK', '1.3.31' + end + + s.subspec 'OMAdapter' do |ss| + ss.dependency 'RUNA/Banner' + ss.dependency 'RUNA/OMSDK' + ss.ios.dependency 'RUNAOMAdapter', '1.0.8' + end + +end From bc8f44abb296e9a5fa707e14e85b0194b84cb59e Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:05:53 +0900 Subject: [PATCH 07/12] update checksum: Core, Banner, OMAdapter --- Package.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index fd87756..8d5a4a3 100644 --- a/Package.swift +++ b/Package.swift @@ -24,21 +24,21 @@ let package = Package( targets: [ .binaryTarget( name: "Core", - url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNACore/RUNACore_iOS_1.4.5.xcframework.zip", - checksum : "14a04c8daf65595004027ae830c09c70a1fc6e63995ae2f3b5b149786ed8eba0" + url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNACore/RUNACore_iOS_1.4.6.xcframework.zip", + checksum : "a5aae671af5dd526e1ab4cdb4a8bfd411ed38c831b1b67657f90f4cb9000272a" ), .binaryTarget( name: "Banner", - url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.1.xcframework.zip", - checksum : "db1d699ecd2239e537ba2372fecf98783c2d8a84e83f0b00193a38ae5a793db1", + url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.2.xcframework.zip", + checksum : "386b76dec8fd0d49a8ae7704809d88aa049f3859caaf02acd9581f19dec73d1d", dependencies: [ "Core" ] ), .binaryTarget( name: "OMAdapter", - url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.7.xcframework.zip", - checksum : "3e8ef20acf3ed3514e25130a7b689ea5f66eb1d9cdd608e697597dca950c5c3e", + url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.8.xcframework.zip", + checksum : "458affe2462cc833f072f69616f1f2faf8b8139f959d959196429fd83fd9790d", dependencies: [ "Banner", "OMSDK", From ad6fd943febfc8847d1a08088c5cddb53831b3b0 Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:30:27 +0900 Subject: [PATCH 08/12] support swift 5.5 for Xcode 13 requirement --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 8d5a4a3..5539880 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.6 +// swift-tools-version: 5.5 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription From f6c2c603258c91046020cf21d051af28a5516bad Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:41:30 +0900 Subject: [PATCH 09/12] SPM: binaryTarget has no dependencies setting --- Package.swift | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index 5539880..eb2aada 100644 --- a/Package.swift +++ b/Package.swift @@ -10,13 +10,17 @@ let package = Package( .library( name: "RUNABanner", targets: [ + "Core", "Banner", ] ), .library( name: "RUNAOMAdapter", targets: [ + "Core", + "Banner", "OMAdapter", + "OMSDK", ] ), ], @@ -31,18 +35,11 @@ let package = Package( name: "Banner", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.2.xcframework.zip", checksum : "386b76dec8fd0d49a8ae7704809d88aa049f3859caaf02acd9581f19dec73d1d", - dependencies: [ - "Core" - ] ), .binaryTarget( name: "OMAdapter", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.8.xcframework.zip", checksum : "458affe2462cc833f072f69616f1f2faf8b8139f959d959196429fd83fd9790d", - dependencies: [ - "Banner", - "OMSDK", - ] ), .binaryTarget( name: "OMSDK", From 5911ccc81c43d1fe7f24eff6c8bcc326357fc7bc Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:42:41 +0900 Subject: [PATCH 10/12] remove comma --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index eb2aada..4ff1375 100644 --- a/Package.swift +++ b/Package.swift @@ -34,12 +34,12 @@ let package = Package( .binaryTarget( name: "Banner", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.2.xcframework.zip", - checksum : "386b76dec8fd0d49a8ae7704809d88aa049f3859caaf02acd9581f19dec73d1d", + checksum : "386b76dec8fd0d49a8ae7704809d88aa049f3859caaf02acd9581f19dec73d1d" ), .binaryTarget( name: "OMAdapter", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.8.xcframework.zip", - checksum : "458affe2462cc833f072f69616f1f2faf8b8139f959d959196429fd83fd9790d", + checksum : "458affe2462cc833f072f69616f1f2faf8b8139f959d959196429fd83fd9790d" ), .binaryTarget( name: "OMSDK", From 9f413e7bd60a7bb803d51e2c501cc58d654cc9b4 Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Thu, 29 Sep 2022 00:53:00 +0900 Subject: [PATCH 11/12] binaryTarget name must be as same as xcframework name --- Package.swift | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Package.swift b/Package.swift index 4ff1375..b412033 100644 --- a/Package.swift +++ b/Package.swift @@ -10,39 +10,39 @@ let package = Package( .library( name: "RUNABanner", targets: [ - "Core", - "Banner", + "RUNACore", + "RUNABanner", ] ), .library( name: "RUNAOMAdapter", targets: [ - "Core", - "Banner", - "OMAdapter", - "OMSDK", + "RUNACore", + "RUNABanner", + "RUNAOMAdapter", + "OMSDK_Rakuten", ] ), ], dependencies: [], targets: [ .binaryTarget( - name: "Core", + name: "RUNACore", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNACore/RUNACore_iOS_1.4.6.xcframework.zip", checksum : "a5aae671af5dd526e1ab4cdb4a8bfd411ed38c831b1b67657f90f4cb9000272a" ), .binaryTarget( - name: "Banner", + name: "RUNABanner", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNABanner/RUNABanner_iOS_1.9.2.xcframework.zip", checksum : "386b76dec8fd0d49a8ae7704809d88aa049f3859caaf02acd9581f19dec73d1d" ), .binaryTarget( - name: "OMAdapter", + name: "RUNAOMAdapter", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMAdapter/RUNAOMAdapter_iOS_1.0.8.xcframework.zip", checksum : "458affe2462cc833f072f69616f1f2faf8b8139f959d959196429fd83fd9790d" ), .binaryTarget( - name: "OMSDK", + name: "OMSDK_Rakuten", url: "https://storage.googleapis.com/rssp-dev-cdn/sdk/ios/prod/RUNAOMSDK/RUNAOMSDK_iOS_1.3.31.xcframework.zip", checksum : "9f5e075651c1c254f6016dd9bc2e8d8e45d6ba2843f8d4c4299e6de6446b31ed" ), From 8a999cf0b522301bd9d0a496bfd95b45fe196668 Mon Sep 17 00:00:00 2001 From: "wei.b.wu-pro14" Date: Wed, 5 Oct 2022 10:23:24 +0900 Subject: [PATCH 12/12] update doc for SPM --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8fdd60..ad2c966 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,13 @@ pod 'RUNA/OMAdapter' ### Swift Package Manager -Swift Package Manager distribution support from 1.10.1. +Swift Package Manager distribution support from 1.10.2 (1.10.1 deprecated). -Add Package's URL `https://github.com/rakuten-ads/Rakuten-Ads-iOS` in Xcode. +Please use package's URL `https://github.com/rakuten-ads/Rakuten-Ads-iOS` in Xcode, + +and select libraries from `RUNABanner`, `RUNAOMAdapter`. + +`RUNAOMAdapter` is essential for the Open Measurement request. ### M1 support