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.

Sign up for GitHub

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

Jump to bottom

Upgrade to MapLibre 11.0.0 #110

Merged
merged 23 commits into from
Nov 8, 2024
Merged

Upgrade to MapLibre 11.0.0 #110

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2dc9919
Upgrade dependencies, build tools & configurations
Fabi755 Jun 4, 2024
ff41955
Set Java & Kotlin version by toolchain
Fabi755 Jun 4, 2024
32972eb
Remove unused butterknife dependency
Fabi755 Jun 4, 2024
a49e0d8
Fix maven (local) publishing, Set MapLibre artifact configuration
Fabi755 Jun 9, 2024
5eff287
Fix Maven publishing config
Fabi755 Jun 10, 2024
d4ecb4b
Upgrade MapLibre to latest major version
Fabi755 Jun 7, 2024
0079047
Change package names to `org.maplibre.navigation.android`
Fabi755 Jun 7, 2024
56591d5
Rename Mapbox names to MapLibre
Fabi755 Jun 7, 2024
24ff628
Fix wrong imports
Fabi755 Jun 7, 2024
5a24cc7
Update artifact group ID
Fabi755 Jun 10, 2024
93d0b6f
Rename Mapbox variable & reference names to MapLibre
Fabi755 Jun 12, 2024
1b325d2
Use Mapbox ids to be equal with native project IDs
Fabi755 Jun 14, 2024
e5c9b85
Fix missing point converts
Fabi755 Sep 18, 2024
c51033c
Merge branch 'main' into feature/maplibre-11
Fabi755 Sep 18, 2024
61923c1
Update MapLibre version
Fabi755 Sep 18, 2024
9e0c9c5
Remove not working street source part
Fabi755 Sep 18, 2024
3c0640f
Add FLOSS tile server as default configuration 💜
Fabi755 Sep 27, 2024
90b50c2
Update to latest MapLibre version
Fabi755 Sep 27, 2024
d0f767f
Merge branch 'main' into feature/maplibre-11
Fabi755 Oct 25, 2024
f1433b5
Rollback license copyright change
Fabi755 Oct 31, 2024
3204bbb
Update to latest MapLibre version
Fabi755 Nov 7, 2024
b94ea90
Remove duplicated classpath line
Fabi755 Nov 7, 2024
5f9472f
Remove unused class MapConnectivityController
Fabi755 Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Hello and thanks for contributing! To help us diagnose your problem quickly, ple

- Include a minimal demonstration of the bug, including code, logs, and screenshots.
- Ensure you can reproduce the bug using the latest release.
- Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/mapbox
- Only post to report a bug or request a feature; direct all other questions to: https://stackoverflow.com/questions/tagged/maplibre
-->

**Android API:**
Expand Down
6 changes: 3 additions & 3 deletions .tx/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ host = https://www.transifex.com
minimum_perc = 20
lang_map = pt_BR: pt-rBR, pt_PT: pt-rPT

[mapbox-navigation-sdk-for-android.test-app-strings-file]
[maplibre-navigation-sdk-for-android.test-app-strings-file]
file_filter = app/src/main/res/values-<lang>/strings.xml
source_file = app/src/main/res/values/strings.xml
source_lang = en
type = ANDROID

[mapbox-navigation-sdk-for-android.libandroid-navigation-strings-file]
[maplibre-navigation-sdk-for-android.libandroid-navigation-strings-file]
file_filter = libandroid-navigation/src/main/res/values-<lang>/strings.xml
source_file = libandroid-navigation/src/main/res/values/strings.xml
source_lang = en
type = ANDROID

[mapbox-navigation-sdk-for-android.libandroid-navigation-ui-strings-file]
[maplibre-navigation-sdk-for-android.libandroid-navigation-ui-strings-file]
file_filter = libandroid-navigation-ui/src/main/res/values-<lang>/strings.xml
source_file = libandroid-navigation-ui/src/main/res/values/strings.xml
source_lang = en
Expand Down
26 changes: 0 additions & 26 deletions CONTRIBUTING.md
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
The MIT License (MIT)

Copyright (c) 2021 Maplibre
Copyright (c) 2019 Flitsmeister
Copyright (c) 2018 Mapbox
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove previous copyrights? I think we have to keep them

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have an legal expert at MapLibre?

But yes, I can roll this also back.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe @ramyaragupathy knows more? My understanding is that we can't just remove copyrights.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rolled back this for now. We can change this later if necessary.

Copyright (c) 2024 Maplibre

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
62 changes: 0 additions & 62 deletions Makefile
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ kotlin {
}

android {
namespace 'com.mapbox.services.android.navigation.testapp'
namespace 'org.maplibre.navigation.android.example'

compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion
Expand All @@ -23,7 +23,7 @@ android {
}

defaultConfig {
applicationId "com.mapbox.services.android.navigation.testapp"
applicationId "org.maplibre.navigation.android.example"
minSdkVersion androidVersions.minSdkVersion
targetSdkVersion androidVersions.targetSdkVersion
versionCode 1
Expand Down Expand Up @@ -63,10 +63,7 @@ android {
dependencies {
implementation project(':libandroid-navigation')
implementation project(':libandroid-navigation-ui')
implementation(dependenciesList.mapLibre) {
exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-geojson'
exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-sdk-turf'
}
implementation dependenciesList.mapLibre

// Support libraries
implementation dependenciesList.androidxAppcompat
Expand Down
103 changes: 0 additions & 103 deletions app/src/androidTest/java/testapp/NavigationViewOrientationTest.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions app/src/androidTest/java/testapp/NavigationViewTest.java
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions app/src/androidTest/java/testapp/action/OrientationChangeAction.java
View file
Open in desktop

This file was deleted.

Loading
Loading