From ddb6a4210401525d66c456095b0245749929e750 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Fri, 18 Dec 2020 15:17:50 +0100 Subject: [PATCH] [general] Rename to maplibre-gl-native --- .github/workflows/android-ci.yml | 2 +- .github/workflows/android-release.yml | 2 +- README.md | 10 +++++----- .../gradle/artifact-settings.gradle | 8 ++++---- .../platform/ios/scripts/deploy-swift-package.sh | 4 ++-- .../platform/ios/scripts/swift_package_template.swift | 2 +- mapbox-gl-native-ios/scripts/environment.js | 2 +- mapbox-gl-native/CMakeLists.txt | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 3eeeab755..e9afce401 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -115,7 +115,7 @@ jobs: if [[ -n "${GLCLOUD_SERVICE_JSON}" ]]; then echo "Activating google cloud account..." echo "${GLCLOUD_SERVICE_JSON}" > secret.json - gcloud auth activate-service-account --key-file secret.json --project maptiler-gl-mobile + gcloud auth activate-service-account --key-file secret.json --project maplibre-gl-native rm secret.json else echo "No secrets.GLCLOUD_SERVICE_JSON variable set, skipping google cloud login..." diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 7c61a8efa..295ce5898 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -115,7 +115,7 @@ jobs: if [[ -n "${GLCLOUD_SERVICE_JSON}" ]]; then echo "Activating google cloud account..." echo "${GLCLOUD_SERVICE_JSON}" > secret.json - gcloud auth activate-service-account --key-file secret.json --project maptiler-gl-mobile + gcloud auth activate-service-account --key-file secret.json --project maplibre-gl-native rm secret.json else echo "No secrets.GLCLOUD_SERVICE_JSON variable set, skipping google cloud login..." diff --git a/README.md b/README.md index c26f267fc..0e4ae20c5 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ For iOS and Android | SDK | Build | Build status | |---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maptiler-gl-mobile/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maptiler-gl-mobile/workflows/ios-ci) | -| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maptiler-gl-mobile/workflows/ios-release/badge.svg)](https://github.com/maptiler/maptiler-gl-mobile/workflows/ios-release) | -| [Mapbox Maps SDK for Android](mapbox-gl-native-android/) | CI | [![Github Action build status](https://github.com/maptiler/maptiler-gl-mobile/workflows/android-ci/badge.svg)](https://github.com/maptiler/maptiler-gl-mobile/workflows/android-ci) | -| [Mapbox Maps SDK for Android](mapbox-gl-native-iandroid/) | Release | [![Github Action build status](https://github.com/maptiler/maptiler-gl-mobile/workflows/android-release/badge.svg)](https://github.com/maptiler/maptiler-gl-mobile/workflows/android-release) | +| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci) | +| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release) | +| [Mapbox Maps SDK for Android](mapbox-gl-native-android/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci) | +| [Mapbox Maps SDK for Android](mapbox-gl-native-iandroid/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) | ## Installation @@ -44,7 +44,7 @@ For iOS and Android 1. To add a package dependency to your Xcode project, select File > Swift Packages > Add Package Dependency and enter its repository URL. You can also navigate to your target’s General pane, and in the “Frameworks, Libraries, and Embedded Content” section, click the + button, select Add Other, and choose Add Package Dependency. -2. Either add MapTiler GitHub distribution URL (https://github.com/maptiler/maptiler-gl-mobile-distribution) or search for `maptiler-gl-mobile` package. +2. Either add MapTiler GitHub distribution URL (https://github.com/maptiler/maplibre-gl-native-distribution) or search for `maplibre-gl-native` package. 3. Choose "next". Xcode should clone the distribution repository and download the binaries. diff --git a/mapbox-gl-native-android/gradle/artifact-settings.gradle b/mapbox-gl-native-android/gradle/artifact-settings.gradle index ac190e6b4..26e664b72 100644 --- a/mapbox-gl-native-android/gradle/artifact-settings.gradle +++ b/mapbox-gl-native-android/gradle/artifact-settings.gradle @@ -5,12 +5,12 @@ ext { mapboxArtifactDescription = 'MapTiler Maps SDK for Android' mapboxDeveloperName = 'MapTiler' mapboxDeveloperId = 'maptiler' - mapboxArtifactUrl = 'https://github.com/maptiler/maptiler-gl-mobile' - mapboxArtifactVcsUrl = 'https://github.com/maptiler/maptiler-gl-mobile.git' - mapboxArtifactScmUrl = 'scm:git@github.com:maptiler/maptiler-gl-mobile.git' + mapboxArtifactUrl = 'https://github.com/maptiler/maplibre-gl-native' + mapboxArtifactVcsUrl = 'https://github.com/maptiler/maplibre-gl-native.git' + mapboxArtifactScmUrl = 'scm:git@github.com:maptiler/maplibre-gl-native.git' mapboxArtifactLicenseName = 'BSD' mapboxArtifactLicenseUrl = 'https://opensource.org/licenses/BSD-2-Clause' - mapboxPackageRepository = 'https://maven.pkg.github.com/maptiler/maptiler-gl-mobile' + mapboxPackageRepository = 'https://maven.pkg.github.com/maptiler/maplibre-gl-native' versionName = project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : System.getenv('VERSION_NAME') mapboxBintrayUserOrg = 'mapbox' diff --git a/mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh b/mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh index a04d6c1f3..8e9fee071 100755 --- a/mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh +++ b/mapbox-gl-native-ios/platform/ios/scripts/deploy-swift-package.sh @@ -17,7 +17,7 @@ function finish { >&2 echo -en "\033[0m"; } trap finish EXIT export GITHUB_USER=maptiler -export GITHUB_REPO=maptiler-gl-mobile +export GITHUB_REPO=maplibre-gl-native export BUILDTYPE=Release VERSION_TAG=${VERSION_TAG:-''} @@ -159,7 +159,7 @@ setTarget "MAPBOX_EVENTS" "${BINARY_DIRECTORY}/${MAPBOX_EVENTS_ZIP_FILE}" "${MAP step "Publishing Swift package…" -DISTRIBUTION_GITHUB_REPO=https://api.github.com/repos/maptiler/maptiler-gl-mobile-distribution +DISTRIBUTION_GITHUB_REPO=https://api.github.com/repos/maptiler/maplibre-gl-native-distribution if [[ -z "${DIST_GITHUB_TOKEN}" ]]; then echo "DIST_GITHUB_TOKEN is not set" diff --git a/mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift b/mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift index 175e8e10d..1684e4aed 100644 --- a/mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift +++ b/mapbox-gl-native-ios/platform/ios/scripts/swift_package_template.swift @@ -2,7 +2,7 @@ import PackageDescription let package = Package( - name: "maptiler-gl-mobile", + name: "maplibre-gl-native", products: [ .library( name: "Mapbox", diff --git a/mapbox-gl-native-ios/scripts/environment.js b/mapbox-gl-native-ios/scripts/environment.js index bb462cfa6..83f025a49 100755 --- a/mapbox-gl-native-ios/scripts/environment.js +++ b/mapbox-gl-native-ios/scripts/environment.js @@ -11,7 +11,7 @@ if (pr) { const number = +pr.match(/\/(\d+)\/?$/)[1]; return github.pullRequests.get({ owner: 'maptiler', - repo: 'maptiler-gl-mobile', + repo: 'maplibre-gl-native', number }).then(({data}) => { const base = data.base.ref; diff --git a/mapbox-gl-native/CMakeLists.txt b/mapbox-gl-native/CMakeLists.txt index 930116582..c9ebb3631 100644 --- a/mapbox-gl-native/CMakeLists.txt +++ b/mapbox-gl-native/CMakeLists.txt @@ -1005,7 +1005,7 @@ set_target_properties( mbgl-core PROPERTIES INTERFACE_MAPBOX_NAME "Mapbox GL Native" - INTERFACE_MAPBOX_URL "https://github.com/maptiler/maptiler-gl-mobile" + INTERFACE_MAPBOX_URL "https://github.com/maptiler/maplibre-gl-native" INTERFACE_MAPBOX_AUTHOR "Mapbox" INTERFACE_MAPBOX_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md )