Skip to content

Commit de1b309

Browse files
committed
Merge branch 'main' into test/ffigen-20-objective_c-9
2 parents 1a61fe4 + 501251f commit de1b309

File tree

107 files changed

+29813
-3466
lines changed

Some content is hidden

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

107 files changed

+29813
-3466
lines changed

.github/ISSUE_TEMPLATE/1-bug.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
name: Bug Report
22
description: Report a bug
3-
title: "[BUG] <title>"
3+
title: ""
44
labels: [ "bug" ]
55
body:
66
- type: dropdown
77
id: platform
88
attributes:
99
label: Platforms
1010
description: On what platforms does the bug happen?
11-
options: [ "All", "Android", "iOS", "Web", "MacOS", "Windows", "Linux" ]
11+
placeholder: "Please Select"
12+
options: [ "Android", "iOS", "Web", "MacOS", "Windows", "Linux", "All" ]
1213
validations:
1314
required: true
1415
- type: input

.github/ISSUE_TEMPLATE/2-feature.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature Request
22
description: Suggest a Feature
3-
title: "[FEATURE] <title>"
3+
title: ""
44
labels: [ "feature" ]
55
body:
66
- type: textarea

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204
- name: Build example APK
205205
run: flutter build apk
206206
- name: Upload apk as artifact
207-
uses: actions/upload-artifact@v4
207+
uses: actions/upload-artifact@v5
208208
if: ${{ matrix.sdk == '' }}
209209
with:
210210
name: maplibre-flutter-demo.apk
@@ -233,7 +233,7 @@ jobs:
233233
run: flutter build ios --release --no-codesign
234234
- name: Upload Runner.app as artifact
235235
if: ${{ matrix.sdk == '' }}
236-
uses: actions/upload-artifact@v4
236+
uses: actions/upload-artifact@v5
237237
with:
238238
name: maplibre-flutter-demo.app
239239
path: build/ios/iphonesimulator

.github/workflows/flutter-beta.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Build example APK
2929
run: flutter build apk
3030
- name: Upload apk as artifact
31-
uses: actions/upload-artifact@v4
31+
uses: actions/upload-artifact@v5
3232
with:
3333
name: maplibre-flutter-demo.apk
3434
path: example/build/app/outputs/flutter-apk/app-release.apk
@@ -50,7 +50,7 @@ jobs:
5050
# - name: Build iOS package
5151
# run: flutter build ios --simulator
5252
# - name: Upload Runner.app as artifact
53-
# uses: actions/upload-artifact@v4
53+
# uses: actions/upload-artifact@v5
5454
# with:
5555
# name: maplibre-flutter-demo.app
5656
# path: example/build/ios/iphonesimulator

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
# 0.3.0
1+
## 0.3.1
2+
3+
### New Features
4+
5+
### Bug Fixes
6+
7+
Full
8+
Changelog: [v0.3.0...v0.3.1](https://github.com/josxha/flutter-maplibre/compare/v0.3.0...v0.3.1)
9+
10+
## 0.3.0
211

312
In this release, I'm blazed to finally announce support for iOS.
413
Similar to our other platforms, iOS uses FFI to natively interop between Dart

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ All kinds of contributions are welcome. Thanks a lot if you consider to
107107
contribute in any way! There are different ways how you can help the
108108
development:
109109

110-
- 🌟Give the project on [GitHub](https://github.com/josxha/flutter-maplibre)
111-
and [pub.dev](https://pub.dev/packages/maplibre).
110+
- 🌟Give the project on [GitHub](https://github.com/josxha/flutter-maplibre) a star
111+
and like it on [pub.dev](https://pub.dev/packages/maplibre).
112112
- 🪴Use the package in your project
113113
and [share feedback](https://github.com/josxha/flutter-maplibre/discussions/categories/show-and-tell).
114114
- 🐛[Open bug reports](https://github.com/josxha/flutter-maplibre/issues/new?assignees=&labels=bug&projects=&template=1-bug.yml&title=%5BBUG%5D+%3Ctitle%3E)

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313

1414
dependencies {
15-
classpath("com.android.tools.build:gradle:8.13.0")
15+
classpath("com.android.tools.build:gradle:8.12.3")
1616
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1717
// noinspection GradleDynamicVersion
1818
classpath("org.jlleitschuh.gradle:ktlint-gradle:13.1.+")
@@ -67,7 +67,7 @@ android {
6767

6868
dependencies {
6969
// jnigen picks up api dependencies
70-
api 'org.maplibre.gl:android-sdk:11.13.+'
70+
api 'org.maplibre.gl:android-sdk:12.0.+'
7171
testImplementation "org.jetbrains.kotlin:kotlin-test"
7272
testImplementation "org.mockito:mockito-core:5.20.+"
7373
}
@@ -86,7 +86,7 @@ android {
8686
}
8787

8888
ktlint {
89-
version = "0.43.2"
89+
version = "1.7.1"
9090
android = true
9191
ignoreFailures = false
9292
reporters {
@@ -95,7 +95,7 @@ ktlint {
9595
}
9696
dependencies {
9797
// noinspection GradleDynamicVersion
98-
ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.+")
98+
ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.27")
9999
}
100100
filter {
101101
exclude("**/*.g.kt")

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#Fri Oct 31 09:53:25 CET 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.github.josxha.maplibre
2+
3+
import io.flutter.plugin.platform.PlatformView
4+
5+
interface FlutterApi {
6+
fun createPlatformView(viewId: Int): PlatformView
7+
}

android/src/main/kotlin/com/github/josxha/maplibre/Helpers.kt

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

0 commit comments

Comments
 (0)