Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Commit

Permalink
Update gl-native (#326)
Browse files Browse the repository at this point in the history
* Update with 1.7.0 release of gl-native

* Remove gl-native

* Remove mobile-events-ios

* Add gl-native

* Remove the DevelopmentTeam id - this can be pulled in from platform/darwin/developer.xcconfig

* Initial update to Makefile, CI and deployment scripts

* Update for new source location.

* Upgrade carthage instead of install

* Update

* Temporarily comment out podspec linting

* Update netrc file generation

* Update netrc generation

* Add Carthage framework path to test target run path

* Ensure build directory exists

* Update docs

* Update pod readme

* Add build directory

* Update Products directory

* Bumped version

* Update build settings

* Update changelog [skip_ci]

* Update platform/ios/CHANGELOG.md

Co-authored-by: Minh Nguyễn <mxn@1ec5.org>

* Update platform/ios/CHANGELOG.md

Co-authored-by: Minh Nguyễn <mxn@1ec5.org>

* Update platform/ios/CHANGELOG.md

Co-authored-by: Minh Nguyễn <mxn@1ec5.org>

* Update platform/ios/CHANGELOG.md

Co-authored-by: Minh Nguyễn <mxn@1ec5.org>

* Review commits

Co-authored-by: Nishant Karajgikar <nishant.karajgikar@mapbox.com>
Co-authored-by: Nishant Karajgikar <nishant-karajgikar@users.noreply.github.com>
Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
  • Loading branch information
4 people authored Jul 6, 2020
1 parent 71202e8 commit 28e4c59
Show file tree
Hide file tree
Showing 50 changed files with 852 additions and 662 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,4 @@ mapbox-gl-native.code-workspace
/scripts/generate-shaders.list
/scripts/generate-style-code.list
*.patch
Carthage
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
[submodule "platform/ios/vendor/mapbox-events-ios"]
path = platform/ios/vendor/mapbox-events-ios
url = https://github.com/mapbox/mapbox-events-ios.git
[submodule "platform/darwin/docs/theme"]
path = platform/darwin/docs/theme
url = https://github.com/mapbox/jazzy-theme.git
[submodule "vendor/mapbox-gl-native"]
path = vendor/mapbox-gl-native
url = https://github.com/mapbox/mapbox-gl-native.git
2 changes: 2 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 1.7.0
github "mapbox/mapbox-events-ios" ~> 0.10
2 changes: 2 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "1.7.0"
github "mapbox/mapbox-events-ios" "v0.10.2"
168 changes: 0 additions & 168 deletions DEVELOPING.md

This file was deleted.

56 changes: 33 additions & 23 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

===========================================================================

Mapbox GL uses portions of Boost.
Mapbox Maps SDK for iOS uses portions of Mapbox GL Native v1.7.0 and above.
License: [Mapbox Terms of Service](https://mapbox.com/legal/tos/)

===========================================================================

Mapbox Maps SDK for iOS uses portions of Mapbox Accounts SDK for iOS.
License: [Mapbox Terms of Service](https://mapbox.com/legal/tos/)

===========================================================================

Mapbox Maps SDK for iOS uses portions of Boost.

Distributed under the Boost Software License, Version 1.0.

http://www.boost.org/LICENSE_1_0.txt

===========================================================================

Mapbox GL uses portions of Clipper.
Mapbox Maps SDK for iOS uses portions of Clipper.

Author : Angus Johnson
Version : 6.1.3a
Expand Down Expand Up @@ -66,7 +76,7 @@ http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf

===========================================================================

Mapbox GL uses portions of BugshotKit.
Mapbox Maps SDK for iOS uses portions of BugshotKit.

The MIT License (MIT)

Expand All @@ -91,7 +101,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

===========================================================================

Mapbox GL uses portions of CSS Color Parser.
Mapbox Maps SDK for iOS uses portions of CSS Color Parser.

(c) Dean McNamee <dean@gmail.com>, 2012.
C++ port by Konstantin Käfer <mail@kkaefer.com>, 2014.
Expand Down Expand Up @@ -119,7 +129,7 @@ IN THE SOFTWARE.

===========================================================================

Mapbox GL uses portions of GLFW.
Mapbox Maps SDK for iOS uses portions of GLFW.

Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
Expand All @@ -145,7 +155,7 @@ freely, subject to the following restrictions:

===========================================================================

Mapbox GL uses portions of libc++.
Mapbox Maps SDK for iOS uses portions of libc++.

The libc++ library is dual licensed under both the University of Illinois
"BSD-Like" license and the MIT license. As a user of this code you may choose
Expand Down Expand Up @@ -222,7 +232,7 @@ THE SOFTWARE.

===========================================================================

Mapbox GL uses portions of libcurl.
Mapbox Maps SDK for iOS uses portions of libcurl.

COPYRIGHT AND PERMISSION NOTICE

Expand All @@ -248,7 +258,7 @@ in this Software without prior written authorization of the copyright holder.

===========================================================================

Mapbox GL uses portions of libjpeg-turbo.
Mapbox Maps SDK for iOS uses portions of libjpeg-turbo.

This software is based in part on the work of the Independent JPEG Group.

Expand Down Expand Up @@ -282,7 +292,7 @@ TurboJPEG/LJT: this implements the TurboJPEG API using libjpeg or libjpeg-turbo

===========================================================================

Mapbox GL uses portions of libpng.
Mapbox Maps SDK for iOS uses portions of libpng.

This copy of the libpng notices is provided for your convenience. In case of
any discrepancy between this copy and the notices in the file png.h that is
Expand Down Expand Up @@ -377,7 +387,7 @@ appreciated.

===========================================================================

Mapbox GL uses portions of libuv.
Mapbox Maps SDK for iOS uses portions of libuv.

libuv is part of the Node project: http://nodejs.org/
libuv may be distributed alone under Node's license:
Expand Down Expand Up @@ -428,7 +438,7 @@ The externally maintained libraries used by libuv are:

===========================================================================

Mapbox GL uses portions of libzip.
Mapbox Maps SDK for iOS uses portions of libzip.

Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner

Expand Down Expand Up @@ -464,7 +474,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

===========================================================================

Mapbox GL uses portions of the Mapbox iOS SDK, which was derived from the
Mapbox Maps SDK for iOS uses portions of the Mapbox iOS SDK, which was derived from the
Route-Me open source project, including the Alpstein fork of it.

The Route-Me license appears below.
Expand Down Expand Up @@ -495,7 +505,7 @@ POSSIBILITY OF SUCH DAMAGE.

===========================================================================

Mapbox GL uses portions of nunicode.
Mapbox Maps SDK for iOS uses portions of nunicode.

Copyright (c) 2013 Aleksey Tulinov <aleksey.tulinov@gmail.com>

Expand All @@ -519,7 +529,7 @@ THE SOFTWARE.

===========================================================================

Mapbox GL uses portions of OpenSSL.
Mapbox Maps SDK for iOS uses portions of OpenSSL.

LICENSE ISSUES
==============
Expand Down Expand Up @@ -644,7 +654,7 @@ copied and put under another distribution licence

===========================================================================

Mapbox GL uses portions of RapidJSON.
Mapbox Maps SDK for iOS uses portions of RapidJSON.

Tencent is pleased to support the open source community by making RapidJSON
available.
Expand Down Expand Up @@ -751,7 +761,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

===========================================================================

Mapbox GL uses portions of Reachability.
Mapbox Maps SDK for iOS uses portions of Reachability.

Copyright (c) 2011, Tony Million.
All rights reserved.
Expand Down Expand Up @@ -780,7 +790,7 @@ POSSIBILITY OF SUCH DAMAGE.

===========================================================================

Mapbox GL uses portions of SQLite.
Mapbox Maps SDK for iOS uses portions of SQLite.

2001 September 15

Expand All @@ -793,7 +803,7 @@ a legal notice, here is a blessing:

===========================================================================

Mapbox GL uses portions of SVPulsingAnnotationView.
Mapbox Maps SDK for iOS uses portions of SVPulsingAnnotationView.

Copyright (c) 2013, Sam Vermette <hello@samvermette.com>

Expand All @@ -811,7 +821,7 @@ THIS SOFTWARE.

===========================================================================

Mapbox GL uses portions of zlib.
Mapbox Maps SDK for iOS uses portions of zlib.

Acknowledgments:

Expand Down Expand Up @@ -845,7 +855,7 @@ freely, subject to the following restrictions:

===========================================================================

Mapbox GL uses portions of Realm Objective-C.
Mapbox Maps SDK for iOS uses portions of Realm Objective-C.

Copyright 2015 Realm Inc.

Expand All @@ -863,7 +873,7 @@ limitations under the License.

===========================================================================

Mapbox GL uses portions of SMCalloutView.
Mapbox Maps SDK for iOS uses portions of SMCalloutView.

Copyright 2016 Nick Farina.

Expand All @@ -873,6 +883,6 @@ https://github.com/nfarina/calloutview/blob/master/LICENSE

===========================================================================

Mapbox GL uses portions of software listed in [platform/android/LICENSE.md](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/android/LICENSE.md).
Mapbox Maps SDK for iOS uses portions of software listed in [platform/android/LICENSE.md](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/android/LICENSE.md).

Mapbox GL uses portions of software listed in [platform/ios/vendor/mapbox-events-ios/LICENSE.md](https://github.com/mapbox/mobile-events-ios/blob/master/LICENSE.md).
Mapbox Maps SDK for iOS uses portions of software listed in [platform/ios/vendor/mapbox-events-ios/LICENSE.md](https://github.com/mapbox/mobile-events-ios/blob/master/LICENSE.md).
Loading

0 comments on commit 28e4c59

Please sign in to comment.