From 3f2a8cacc8d7f639d198253b7d53a45c08a71aca Mon Sep 17 00:00:00 2001 From: anhnguyen1618 Date: Mon, 1 Feb 2021 17:25:38 +0200 Subject: [PATCH] [release] Bump to v9.2.0 --- LICENSE.md | 213 ------------------ Package.swift | 4 +- README.md | 6 +- Tests/Integration/Carthage/Cartfile | 2 +- .../Carthage/Sources/AppDelegate.swift | 2 +- Tests/Integration/CocoaPods/Podfile | 2 +- .../CocoaPods/Sources/AppDelegate.swift | 2 +- .../Integration/SPM/Sources/AppDelegate.swift | 2 +- Tests/Integration/SPM/project.yml | 2 +- .../MapboxCommonTests/MapboxCommonTests.swift | 2 +- 10 files changed, 12 insertions(+), 225 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index acb9040..a22555e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,216 +1,3 @@ -Mapbox Common SDK - -Copyright (c) 2021 - Mapbox, Inc. - -You may use this code with your Mapbox account and under the -Mapbox Terms of Service (https://www.mapbox.com/tos/). - -All other rights reserved. - -=========================================================================== - -Mapbox Common SDK - -Copyright (c) 2021 - Mapbox, Inc. - -You may use this code with your Mapbox account and under the -Mapbox Terms of Service (https://www.mapbox.com/tos/). - -All other rights reserved. - -=========================================================================== - -Mapbox Common SDK uses portions of linenoise - -Copyright (c) 2010-2014, Salvatore Sanfilippo -Copyright (c) 2010-2013, Pieter Noordhuis - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=========================================================================== - -Mapbox Common SDK uses portions of asio - -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -=========================================================================== - -Mapbox Common SDK uses portions of cpp-httplib - -The MIT License (MIT) - -Copyright (c) 2017 yhirose - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - -=========================================================================== - -Mapbox Common SDK uses portions of fmt - -Copyright (c) 2012 - present, Victor Zverovich - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ---- Optional exception to the license --- - -As an exception, if, as a result of your compiling your source code, portions -of this Software are embedded into a machine-executable object form of such -source code, you may redistribute such embedded portions in such object form -without including the above copyright and permission notices. - -=========================================================================== - -Mapbox Common SDK uses portions of googletest - -Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -=========================================================================== - -Mapbox Common SDK uses portions of gzip-hpp - -Copyright (c) 2017, Mapbox Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -=========================================================================== - -Mapbox Common SDK uses portions of mapbox-bindgen - -Copyright (c) 2019 - Mapbox, Inc. - -You may use this code with your Mapbox account and under the -Mapbox Terms of Service (https://www.mapbox.com/tos/). - -All other rights reserved. - -=========================================================================== - -Mapbox Common SDK uses portions of mapbox-license-checker - Copyright (c) 2020 - Mapbox, Inc. You may use this code with your Mapbox account and under the diff --git a/Package.swift b/Package.swift index 5d35c0a..8682c69 100644 --- a/Package.swift +++ b/Package.swift @@ -5,8 +5,8 @@ import PackageDescription import Foundation let registry = SDKRegistry() -let version = "10.0.0-beta.9" -let checksum = "c5ed2d5ba8beabeeb912524bd9ec135368b69374568c9b9bf8be33b9201d59e7" +let version = "9.2.0" +let checksum = "9c18d2e87244dc25b6a3e7c27a26bab18d32ecd672fc71fffe6ab5bff8cce3a6" let package = Package( name: "MapboxCommon", diff --git a/README.md b/README.md index c9ad5d3..10bb836 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ machine api.mapbox.com ###### Using SPM Package 📱🖥💻 ```swift -.package(url: "https://github.com/mapbox/mapbox-common-ios.git", from: "10.0.0-beta.8"), +.package(url: "https://github.com/mapbox/mapbox-common-ios.git", from: "9.2.0"), ``` ##### CocoaPods 📱🖥💻 ```ruby -pod 'MapboxCommon', '10.0.0-beta.8' +pod 'MapboxCommon', '9.2.0' ``` ##### Carthage 📱 @@ -44,7 +44,7 @@ pod 'MapboxCommon', '10.0.0-beta.8' Add the following code to your Cartfile. ```bash -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" == 10.0.0-beta.8 +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" == 9.2.0 ``` Then run the following command in the Terminal. diff --git a/Tests/Integration/Carthage/Cartfile b/Tests/Integration/Carthage/Cartfile index 78aac39..943c7f9 100644 --- a/Tests/Integration/Carthage/Cartfile +++ b/Tests/Integration/Carthage/Cartfile @@ -1 +1 @@ -binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" == 10.0.0-beta.9 +binary "https://api.mapbox.com/downloads/v2/carthage/mapbox-common/MapboxCommon-ios.json" == 9.2.0 diff --git a/Tests/Integration/Carthage/Sources/AppDelegate.swift b/Tests/Integration/Carthage/Sources/AppDelegate.swift index 68ca278..37ce397 100644 --- a/Tests/Integration/Carthage/Sources/AppDelegate.swift +++ b/Tests/Integration/Carthage/Sources/AppDelegate.swift @@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - assert(try! Version.getString().count > 0) + assert(try! Version.getCommonSDKVersionString().count > 0) return true } } diff --git a/Tests/Integration/CocoaPods/Podfile b/Tests/Integration/CocoaPods/Podfile index aeaa11c..65684c0 100644 --- a/Tests/Integration/CocoaPods/Podfile +++ b/Tests/Integration/CocoaPods/Podfile @@ -1,5 +1,5 @@ platform :ios, '11.0' target 'PodInstall' do - pod 'MapboxCommon', '10.0.0-beta.9' + pod 'MapboxCommon', '9.2.0' end diff --git a/Tests/Integration/CocoaPods/Sources/AppDelegate.swift b/Tests/Integration/CocoaPods/Sources/AppDelegate.swift index 68ca278..37ce397 100644 --- a/Tests/Integration/CocoaPods/Sources/AppDelegate.swift +++ b/Tests/Integration/CocoaPods/Sources/AppDelegate.swift @@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - assert(try! Version.getString().count > 0) + assert(try! Version.getCommonSDKVersionString().count > 0) return true } } diff --git a/Tests/Integration/SPM/Sources/AppDelegate.swift b/Tests/Integration/SPM/Sources/AppDelegate.swift index 68ca278..37ce397 100644 --- a/Tests/Integration/SPM/Sources/AppDelegate.swift +++ b/Tests/Integration/SPM/Sources/AppDelegate.swift @@ -7,7 +7,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - assert(try! Version.getString().count > 0) + assert(try! Version.getCommonSDKVersionString().count > 0) return true } } diff --git a/Tests/Integration/SPM/project.yml b/Tests/Integration/SPM/project.yml index 85f69c7..2d5eca9 100644 --- a/Tests/Integration/SPM/project.yml +++ b/Tests/Integration/SPM/project.yml @@ -4,7 +4,7 @@ options: packages: MapboxCommon: url: git@github.com:mapbox/mapbox-common-ios.git - branch: release-v10.0.0-beta.9 + branch: release-v9.2.0 targets: SPMTest: type: application diff --git a/Tests/MapboxCommonTests/MapboxCommonTests.swift b/Tests/MapboxCommonTests/MapboxCommonTests.swift index e31740c..53c4657 100644 --- a/Tests/MapboxCommonTests/MapboxCommonTests.swift +++ b/Tests/MapboxCommonTests/MapboxCommonTests.swift @@ -4,7 +4,7 @@ import MapboxCommon final class MapboxCommonTests: XCTestCase { func testVersion() { - XCTAssertTrue(Version.getString().count > 0) + XCTAssertTrue(Version.getCommonSDKVersionString().count > 0) } static var allTests = [