Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add iOS as a supported platform #169

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b9d5331
add maplibre_ios package
josxha Dec 5, 2024
c0529af
create ios specific dart files
josxha Dec 5, 2024
a40b627
spm
josxha Dec 5, 2024
618d773
/example and /maplibre_ios/example successful
josxha Dec 5, 2024
3358048
use maplibre in swift
josxha Dec 5, 2024
c6831a5
add MapLibre import to maplibre_ios to ensure it builds
josxha Dec 5, 2024
864f867
update bundle id
josxha Dec 5, 2024
40d5ecf
Update project.pbxproj
josxha Dec 5, 2024
28a7247
successfully rendered the first map
josxha Dec 6, 2024
7baa560
adjust pigeon
josxha Dec 6, 2024
c1f8746
Merge branch 'main' into feat/ios3-2
josxha Dec 7, 2024
9262636
fix merge
josxha Dec 7, 2024
ebdad13
format MapLibreMapStateIos
josxha Dec 7, 2024
a89a9c7
some swift implementation
josxha Dec 7, 2024
b465bbc
register method channels
josxha Dec 7, 2024
876d5e4
use initial MapOptions
josxha Dec 7, 2024
cb4efaf
update license
josxha Dec 7, 2024
6f4746d
Merge branch 'feat/ios3-2-2' into ios
josxha Dec 7, 2024
e24bc81
chore: add ios ci builds (#170)
josxha Dec 7, 2024
de3d796
add swift format checks to the CI (#171)
josxha Dec 8, 2024
8826c86
access `MLNMapView` from within dart, implement programmatic controls…
josxha Dec 11, 2024
d6261d3
Merge branch 'main' into ios
josxha Dec 11, 2024
efef722
Merge branch 'main' into ios
josxha Dec 14, 2024
332aa4b
dart format
josxha Dec 14, 2024
8c633c2
Merge branch 'main' into ios
josxha Dec 22, 2024
249f7ab
ios: paint and layout properties (#175)
josxha Dec 28, 2024
42052c5
Update MapViewDelegate.swift
josxha Dec 28, 2024
ebc69b3
Update MapViewDelegate.swift
josxha Dec 28, 2024
797c512
Merge branch 'main' into ios
josxha Jan 1, 2025
b23b7e4
Update style_controller.dart
josxha Jan 2, 2025
236d7bb
Update style_layers_symbol_page.dart
josxha Jan 2, 2025
a3c39a3
Merge branch 'main' into ios
josxha Jan 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 39 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ jobs:
cache: true
- name: Lint analysis
run: dart format --set-exit-if-changed .
lints-swift:
name: "[Swift] Check formatting"
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: "Install SwiftFormat"
run: brew install swiftformat
- name: "Format Swift code"
run: swiftformat --verbose --lint . --reporter github-actions-log --swiftversion 5
lint-dart:
name: "[Dart] Static code analysis"
runs-on: ubuntu-latest
Expand Down Expand Up @@ -198,36 +207,36 @@ jobs:
with:
name: maplibre-flutter-demo.apk
path: example/build/app/outputs/flutter-apk/app-release.apk
# build-iOS:
# name: [iOS] Build package
# runs-on: macos-latest
# timeout-minutes: 30
# defaults:
# run:
# working-directory: example
# strategy:
# fail-fast: false
# matrix:
# sdk: [ '3.27.0', '' ]
# steps:
# - uses: actions/checkout@v4
# - uses: subosito/flutter-action@v2
# with:
# flutter-version: ${{ matrix.sdk }}
# cache: true
# - uses: maxim-lobanov/setup-cocoapods@v1
# with:
# podfile-path: example/ios/Podfile.lock
# - name: "Get Flutter dependencies"
# run: dart pub get
# - name: Build iOS package
# run: flutter build ios --simulator
# - name: Upload Runner.app as artifact
# if: ${{ matrix.sdk == '' }}
# uses: actions/upload-artifact@v4
# with:
# name: maplibre-flutter-demo.app
# path: example/build/ios/iphonesimulator
build-ios:
name: "[iOS] Build package"
runs-on: macos-latest
timeout-minutes: 30
defaults:
run:
working-directory: example
strategy:
fail-fast: false
matrix:
sdk: [ '3.27.0', '' ]
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ matrix.sdk }}
cache: true
- uses: maxim-lobanov/setup-cocoapods@v1
with:
podfile-path: example/ios/Podfile.lock
- name: "Get Flutter dependencies"
run: dart pub get
- name: "Build iOS package"
run: flutter build ios --simulator
- name: Upload Runner.app as artifact
if: ${{ matrix.sdk == '' }}
uses: actions/upload-artifact@v4
with:
name: maplibre-flutter-demo.app
path: example/build/ios/iphonesimulator
build-web:
name: "[Web] Build"
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@ build/

# jnigen
/mvn_jar/
/mvn_java/
/mvn_java/

# Swift Package Manager
Package.resolved
.swiftpm
3 changes: 2 additions & 1 deletion .pubignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
docs/
example/assets/
pigeons/
pigeons/
maplibre_ios/
62 changes: 62 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,65 @@
The iOS implementation is licensed under the following license:

This Non-Profit Open Software License (“Non-Profit OSL”) version 3.0 (the “License”) applies to any original work of authorship (the “Original Work”) whose owner (the “Licensor”) has placed the following licensing notice adjacent to the copyright notice for the Original Work:

Licensed under the Non-Profit Open Software License version 3.0

1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

a) to reproduce the Original Work in copies, either alone or as part of a collective work;

b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works (“Derivative Works”) based upon the Original Work;

c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Non-Profit Open Software License or as provided in section 17(d);

d) to perform the Original Work publicly; and

e) to display the Original Work publicly.

2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.

3) Grant of Source Code License. The term “Source Code” means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.

4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor’s trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.

5) External Deployment. The term “External Deployment” means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).

6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an “Attribution Notice.” You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.

7) Warranty of Provenance and Disclaimer of Warranty. The Original Work is provided under this License on an “AS IS” BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.

8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.

9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including “fair use” or “fair dealing”). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).

10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.

11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.

12) Attorneys’ Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys’ fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.

13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.

14) Definition of “You” in This License. “You” throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.

16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the “Modified License”) and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the “Open Software License” or “OSL” and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice “Licensed under <insert your license name here>” or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

17) Non-Profit Amendment. The name of this amended version of the Open Software License (“OSL 3.0”) is “Non-Profit Open Software License 3.0”. The original OSL 3.0 license has been amended as follows:

(a) Licensor represents and declares that it is a not-for-profit organization that derives no revenue whatsoever from the distribution of the Original Work or Derivative Works thereof, or from support or services relating thereto.

(b) The first sentence of Section 7 [“Warranty of Provenance”] of OSL 3.0 has been stricken. For Original Works licensed under this Non-Profit OSL 3.0, LICENSOR OFFERS NO WARRANTIES WHATSOEVER.

(c) In the first sentence of Section 8 [“Limitation of Liability”] of this Non-Profit OSL 3.0, the list of damages for which LIABILITY IS LIMITED now includes “direct” damages.

(d) The proviso in Section 1(c) of this License now refers to this “Non-Profit Open Software License” rather than the “Open Software License”. You may distribute or communicate the Original Work or Derivative Works thereof under this Non-Profit OSL 3.0 license only if You make the representation and declaration in paragraph (a) of this Section 17. Otherwise, You shall distribute or communicate the Original Work or Derivative Works thereof only under the OSL 3.0 license and You shall publish clear licensing notices so stating. Also by way of clarification, this License does not authorize You to distribute or communicate works under this Non-Profit OSL 3.0 if You received them under the original OSL 3.0 license.

(e) Original Works licensed under this license shall reference “Non-Profit OSL 3.0” in licensing notices to distinguish them from works licensed under the original OSL 3.0 license.

--------------------------------------------------------------------------------

Copyright 2024 Joscha Eckert (josxha)

Redistribution and use in source and binary forms, with or without modification,
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# MapLibre for Flutter

> [!WARNING]
> The iOS implementation is during the funding phase provided under
> the [Non-Profit Open Software License version 3.0 (NPOSL-3.0)](https://opensource.org/license/osl-3-0-php).
> After funding is completed, it will get released under the permissive 3-Clause BSD License.

[![Pub Version](https://img.shields.io/pub/v/maplibre)](https://pub.dev/packages/maplibre)
[![stars](https://badgen.net/github/stars/josxha/flutter-maplibre?label=stars&color=green&icon=github)](https://github.com/josxha/flutter-maplibre/stargazers)
[![likes](https://img.shields.io/pub/likes/maplibre?logo=flutter)](https://pub.dev/packages/maplibre)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
// Autogenerated from Pigeon (v22.6.0), do not edit directly.
// swiftformat:disable all
// Autogenerated from Pigeon (v22.7.0), do not edit directly.
// See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")


import android.util.Log
import io.flutter.plugin.common.BasicMessageChannel
import io.flutter.plugin.common.BinaryMessenger
import io.flutter.plugin.common.EventChannel
import io.flutter.plugin.common.MessageCodec
import io.flutter.plugin.common.StandardMethodCodec
import io.flutter.plugin.common.StandardMessageCodec
import java.io.ByteArrayOutputStream
import java.nio.ByteBuffer
Expand Down
2 changes: 2 additions & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
1 change: 1 addition & 0 deletions example/ios/Flutter/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
1 change: 1 addition & 0 deletions example/ios/Flutter/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
1 change: 0 additions & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ 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
Expand Down
22 changes: 22 additions & 0 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
PODS:
- Flutter (1.0.0)
- objective_c (0.0.1):
- Flutter

DEPENDENCIES:
- Flutter (from `Flutter`)
- objective_c (from `.symlinks/plugins/objective_c/ios`)

EXTERNAL SOURCES:
Flutter:
:path: Flutter
objective_c:
:path: ".symlinks/plugins/objective_c/ios"

SPEC CHECKSUMS:
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
objective_c: 77e887b5ba1827970907e10e832eec1683f3431d

PODFILE CHECKSUM: 4305caec6b40dde0ae97be1573c53de1882a07e5

COCOAPODS: 1.16.2
Loading
Loading