Skip to content

Commit

Permalink
feat!: migrate maplibre-native for iOS to version 6.4.2 (maplibre…
Browse files Browse the repository at this point in the history
…#405)

This pull request updates the maplibre-native version to `6.4.2` for
iOS. Before the unstable version `5.14.0-pre3` was used.

The iOS changelog for maplibre-native can be viewed
[here](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/CHANGELOG.md#600)
(only iOS Devices with an Apple A7 GPU or later are supported from now
on).

Closes maplibre#388
  • Loading branch information
josxha authored and remax21 committed Sep 6, 2024
1 parent 3e70cc5 commit 6a91075
Show file tree
Hide file tree
Showing 44 changed files with 502 additions and 369 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

### Breaking changes

* All Dart enums have been migrated from mixed cases to lower camelcase according to the `camel_case_types` lint rule.
* All Dart enums have been migrated from mixed cases to lower camelcase
according to the `camel_case_types` lint rule.
* Updated maplibre-native for ios to v6.4.2. This introduces the new
iOS Metal renderer and the OpenGL ES renderer now uses OpenGL ES 3.0. Only
iOS Devices with an Apple A7 GPU or later are supported onwards. See the
[maplibre-native changelog](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/CHANGELOG.md#600)
for more information.

## 0.19.0

Expand Down Expand Up @@ -71,9 +77,9 @@ builds).

## 0.17.0

* **Repository transfer**: The project repository was transferred to the MapLibre
GitHub organization. More information
at [#221](https://github.com/maplibre/flutter-maplibre-gl/issues/221)
* **Repository transfer**: The project repository was transferred to the
MapLibre GitHub organization. More information
at [#221](https://github.com/maplibre/flutter-maplibre-gl/issues/221)
* Developers do not need to adapt their Podfile for iOS apps anymore as it was
previously described in the
Readme. [#278](https://github.com/maplibre/flutter-maplibre-gl/pull/278)
Expand Down Expand Up @@ -190,7 +196,7 @@ at the end for a full changelog.
* attributionButtonPosition for web by @ouvreboite
in [#304](https://github.com/maplibre/flutter-maplibre-gl/pull/304)

**Full Changelog**:
**Full Changelog**:
https://github.com/maplibre/flutter-maplibre-gl/compare/0.16.0...0.17.0

## 0.16.0, Jun 28, 2022
Expand Down
23 changes: 7 additions & 16 deletions example/.metadata
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
channel: stable
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
- platform: android
create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
- platform: ios
create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
- platform: macos
create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
- platform: web
create_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
base_revision: d3d8effc686d73e0114d71abdcccef63fa1f25d2
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1

# User provided section

Expand Down
2 changes: 2 additions & 0 deletions example/ios/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/dgph
*.mode1v3
*.mode2v3
*.moved-aside
Expand All @@ -18,6 +19,7 @@ Flutter/App.framework
Flutter/Flutter.framework
Flutter/Flutter.podspec
Flutter/Generated.xcconfig
Flutter/ephemeral/
Flutter/app.flx
Flutter/app.zip
Flutter/flutter_assets/
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion example/ios/Flutter/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
2 changes: 1 addition & 1 deletion example/ios/Flutter/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
10 changes: 6 additions & 4 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '11.0'

# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -31,10 +30,13 @@ flutter_ios_podfile_setup
target 'Runner' do
use_frameworks!
use_modular_headers!

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end
# commit 2c5aa27d7f039327306d1ecf80976778fd3ffcab from upstream#797 undone in PR #128

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
Expand Down
14 changes: 7 additions & 7 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ PODS:
- Flutter (1.0.0)
- location (0.0.1):
- Flutter
- MapLibre (5.14.0-pre3)
- MapLibre (6.4.2)
- maplibre_gl (0.0.1):
- Flutter
- MapLibre (= 5.14.0-pre3)
- MapLibre (= 6.4.2)
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
Expand Down Expand Up @@ -37,12 +37,12 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
location: d5cf8598915965547c3f36761ae9cc4f4e87d22e
MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef
maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
MapLibre: 4f0d474084b9c73ee5f4066e2e3bf03f0e2efad4
maplibre_gl: a10404a60394e958fd9631ad8b2e1e5d0dafa612
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

PODFILE CHECKSUM: 76b02dc813a095e7650def38e0c540365f37c732
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

COCOAPODS: 1.15.2
Loading

0 comments on commit 6a91075

Please sign in to comment.