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: bump android dependencies, dependabot group dependencies #157

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ updates:
schedule:
interval: "weekly"
- package-ecosystem: "pub"
directories:
- "/"
- "/example"
directories: [ "/", "/example" ]
schedule:
interval: "weekly"
ignore:
Expand All @@ -25,8 +23,9 @@ updates:
dependencies:
patterns: [ "*" ]
- package-ecosystem: "gradle"
directories:
- "/android"
- "/example/android"
directories: [ "/android" , "/example/android" ]
schedule:
interval: "weekly"
groups:
dependencies:
patterns: [ "*" ]
6 changes: 4 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = "com.github.josxha.maplibre"
version = "1.0-SNAPSHOT"

buildscript {
ext.kotlin_version = "2.0.21"
ext.kotlin_version = "2.1.0"
repositories {
google()
mavenCentral()
Expand All @@ -14,7 +14,8 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
classpath("org.jlleitschuh.gradle:ktlint-gradle:12.1.1")
// noinspection GradleDynamicVersion
classpath("org.jlleitschuh.gradle:ktlint-gradle:12.1.+")
}
}

Expand Down Expand Up @@ -102,6 +103,7 @@ ktlint {
reporter("checkstyle")
}
dependencies {
// noinspection GradleDynamicVersion
ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.+")
}
filter {
Expand Down
1 change: 1 addition & 0 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ktlint {
reporter("checkstyle")
}
dependencies {
// noinspection GradleDynamicVersion
ktlintRuleset("io.nlopez.compose.rules:ktlint:0.4.+")
}
filter {
Expand Down
2 changes: 1 addition & 1 deletion example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.6.1' apply false
// use a Kotlin version that is compatible with MapLibre
id "org.jetbrains.kotlin.android" version "2.0.21" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
id "org.jlleitschuh.gradle.ktlint" version "12.1.1" apply false
}

Expand Down
4 changes: 2 additions & 2 deletions example/integration_test/general_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void main() {
expect(tester.allWidgets.any((w) => w is MapLibreMap), isTrue);
});

testWidgets('render map with hc', (tester) async {
/*testWidgets('render map with hc', (tester) async {
await tester.pumpWidget(
App(
options: MapOptions(
Expand All @@ -50,7 +50,7 @@ void main() {
);
await tester.pumpAndSettle();
expect(tester.allWidgets.any((w) => w is MapLibreMap), isTrue);
});
});*/

testWidgets('update map options', (tester) async {
final o1 = MapOptions(initCenter: Position(0, 0));
Expand Down
Loading