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

Commit 28e4c59

Browse files
Julian Rexnishant-karajgikar1ec5
authored
Update gl-native (#326)
* 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>
1 parent 71202e8 commit 28e4c59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+852
-662
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ mapbox-gl-native.code-workspace
5050
/scripts/generate-shaders.list
5151
/scripts/generate-style-code.list
5252
*.patch
53+
Carthage

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
[submodule "platform/ios/vendor/mapbox-events-ios"]
2-
path = platform/ios/vendor/mapbox-events-ios
3-
url = https://github.com/mapbox/mapbox-events-ios.git
41
[submodule "platform/darwin/docs/theme"]
52
path = platform/darwin/docs/theme
63
url = https://github.com/mapbox/jazzy-theme.git
7-
[submodule "vendor/mapbox-gl-native"]
8-
path = vendor/mapbox-gl-native
9-
url = https://github.com/mapbox/mapbox-gl-native.git

Cartfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" == 1.7.0
2+
github "mapbox/mapbox-events-ios" ~> 0.10

Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
binary "https://api.mapbox.com/downloads/v2/carthage/mobile-maps-gl-core/mapbox-ios-sdk-gl-core-static.json" "1.7.0"
2+
github "mapbox/mapbox-events-ios" "v0.10.2"

DEVELOPING.md

Lines changed: 0 additions & 168 deletions
This file was deleted.

LICENSE.md

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,25 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

2626
===========================================================================
2727

28-
Mapbox GL uses portions of Boost.
28+
Mapbox Maps SDK for iOS uses portions of Mapbox GL Native v1.7.0 and above.
29+
License: [Mapbox Terms of Service](https://mapbox.com/legal/tos/)
30+
31+
===========================================================================
32+
33+
Mapbox Maps SDK for iOS uses portions of Mapbox Accounts SDK for iOS.
34+
License: [Mapbox Terms of Service](https://mapbox.com/legal/tos/)
35+
36+
===========================================================================
37+
38+
Mapbox Maps SDK for iOS uses portions of Boost.
2939

3040
Distributed under the Boost Software License, Version 1.0.
3141

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

3444
===========================================================================
3545

36-
Mapbox GL uses portions of Clipper.
46+
Mapbox Maps SDK for iOS uses portions of Clipper.
3747

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

6777
===========================================================================
6878

69-
Mapbox GL uses portions of BugshotKit.
79+
Mapbox Maps SDK for iOS uses portions of BugshotKit.
7080

7181
The MIT License (MIT)
7282

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

92102
===========================================================================
93103

94-
Mapbox GL uses portions of CSS Color Parser.
104+
Mapbox Maps SDK for iOS uses portions of CSS Color Parser.
95105

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

120130
===========================================================================
121131

122-
Mapbox GL uses portions of GLFW.
132+
Mapbox Maps SDK for iOS uses portions of GLFW.
123133

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

146156
===========================================================================
147157

148-
Mapbox GL uses portions of libc++.
158+
Mapbox Maps SDK for iOS uses portions of libc++.
149159

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

223233
===========================================================================
224234

225-
Mapbox GL uses portions of libcurl.
235+
Mapbox Maps SDK for iOS uses portions of libcurl.
226236

227237
COPYRIGHT AND PERMISSION NOTICE
228238

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

249259
===========================================================================
250260

251-
Mapbox GL uses portions of libjpeg-turbo.
261+
Mapbox Maps SDK for iOS uses portions of libjpeg-turbo.
252262

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

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

283293
===========================================================================
284294

285-
Mapbox GL uses portions of libpng.
295+
Mapbox Maps SDK for iOS uses portions of libpng.
286296

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

378388
===========================================================================
379389

380-
Mapbox GL uses portions of libuv.
390+
Mapbox Maps SDK for iOS uses portions of libuv.
381391

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

429439
===========================================================================
430440

431-
Mapbox GL uses portions of libzip.
441+
Mapbox Maps SDK for iOS uses portions of libzip.
432442

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

@@ -464,7 +474,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
464474

465475
===========================================================================
466476

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

470480
The Route-Me license appears below.
@@ -495,7 +505,7 @@ POSSIBILITY OF SUCH DAMAGE.
495505

496506
===========================================================================
497507

498-
Mapbox GL uses portions of nunicode.
508+
Mapbox Maps SDK for iOS uses portions of nunicode.
499509

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

@@ -519,7 +529,7 @@ THE SOFTWARE.
519529

520530
===========================================================================
521531

522-
Mapbox GL uses portions of OpenSSL.
532+
Mapbox Maps SDK for iOS uses portions of OpenSSL.
523533

524534
LICENSE ISSUES
525535
==============
@@ -644,7 +654,7 @@ copied and put under another distribution licence
644654

645655
===========================================================================
646656

647-
Mapbox GL uses portions of RapidJSON.
657+
Mapbox Maps SDK for iOS uses portions of RapidJSON.
648658

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

752762
===========================================================================
753763

754-
Mapbox GL uses portions of Reachability.
764+
Mapbox Maps SDK for iOS uses portions of Reachability.
755765

756766
Copyright (c) 2011, Tony Million.
757767
All rights reserved.
@@ -780,7 +790,7 @@ POSSIBILITY OF SUCH DAMAGE.
780790

781791
===========================================================================
782792

783-
Mapbox GL uses portions of SQLite.
793+
Mapbox Maps SDK for iOS uses portions of SQLite.
784794

785795
2001 September 15
786796

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

794804
===========================================================================
795805

796-
Mapbox GL uses portions of SVPulsingAnnotationView.
806+
Mapbox Maps SDK for iOS uses portions of SVPulsingAnnotationView.
797807

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

@@ -811,7 +821,7 @@ THIS SOFTWARE.
811821

812822
===========================================================================
813823

814-
Mapbox GL uses portions of zlib.
824+
Mapbox Maps SDK for iOS uses portions of zlib.
815825

816826
Acknowledgments:
817827

@@ -845,7 +855,7 @@ freely, subject to the following restrictions:
845855

846856
===========================================================================
847857

848-
Mapbox GL uses portions of Realm Objective-C.
858+
Mapbox Maps SDK for iOS uses portions of Realm Objective-C.
849859

850860
Copyright 2015 Realm Inc.
851861

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

864874
===========================================================================
865875

866-
Mapbox GL uses portions of SMCalloutView.
876+
Mapbox Maps SDK for iOS uses portions of SMCalloutView.
867877

868878
Copyright 2016 Nick Farina.
869879

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

874884
===========================================================================
875885

876-
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).
886+
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).
877887

878-
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).
888+
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).

0 commit comments

Comments
 (0)