Repository migration from MapTiler to MapLibre

2021-02-04 11:53:40 +01:00
parent c933d73e0c
commit 62ab3e4340
12 changed files with 29 additions and 22 deletions
--- a/.github/workflows/android-ci-pull.yml
+++ b/.github/workflows/android-ci-pull.yml
@@ -18,7 +18,14 @@ jobs:
      run:
        working-directory: platform/android
    container:
-      image: ghcr.io/maptiler/android-ndk-r21b
+      image: ghcr.io/maplibre/android-ndk-r21b
+      # FIXME: remove credentials when 
+      # public access to docker images will be
+      # enable in MapLibre organization
+      # This is needed for PRs from outside
+      credentials:
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.CR_PAT }}      
    env:
      LIBSYSCONFCPUS: 8
      JOBS: 8
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -20,7 +20,7 @@ jobs:
      run:
        working-directory: platform/android
    container:
-      image: ghcr.io/maptiler/android-ndk-r21b
+      image: ghcr.io/maplibre/android-ndk-r21b
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.CR_PAT }}
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -15,7 +15,7 @@ jobs:
      run:
        working-directory: platform/android
    container:
-      image: ghcr.io/maptiler/android-ndk-r21b
+      image: ghcr.io/maplibre/android-ndk-r21b
      credentials:
        username: ${{ github.repository_owner }}
        password: ${{ secrets.CR_PAT }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1006,7 +1006,7 @@ set_target_properties(
    mbgl-core
    PROPERTIES
        INTERFACE_MAPBOX_NAME "Mapbox GL Native"
-        INTERFACE_MAPBOX_URL "https://github.com/maptiler/maplibre-gl-native"
+        INTERFACE_MAPBOX_URL "https://github.com/maplibre/maplibre-gl-native"
        INTERFACE_MAPBOX_AUTHOR "Mapbox"
        INTERFACE_MAPBOX_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md
 )
--- a/README.md
+++ b/README.md
@@ -17,16 +17,16 @@ Beside merging in platform specific SDKs, the following changes were made compar

 | SDK                                                           | Build   | Build status                                                                                                                                                                                  |
 |---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [Mapbox Maps SDK for 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](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](platform/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](platform/android/)     | 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) |
+| [Mapbox Maps SDK for iOS](platform/ios/) | CI      | [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/workflows/ios-ci)                   |
+| [Mapbox Maps SDK for iOS](platform/ios/) | Release | [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maplibre/maplibre-gl-native/workflows/ios-release)         |
+| [Mapbox Maps SDK for Android](platform/android/)      | CI      | [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maplibre/maplibre-gl-native/workflows/android-ci)           |
+| [Mapbox Maps SDK for Android](platform/android/)     | Release | [![GitHub Action build status](https://github.com/maplibre/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maplibre/maplibre-gl-native/workflows/android-release) |

 ## Installation

 ### Android

-1. Add bintray maven repositories to your build.gradle at project level so that you can access MapTiler packages for Android:
+1. Add bintray maven repositories to your build.gradle at project level so that you can access MapLibre packages for Android:

    ```gradle
        allprojects {
@@ -55,7 +55,7 @@ Beside merging in platform specific SDKs, the following changes were made compar

 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/maplibre-gl-native-distribution) or search for `maplibre-gl-native` package.
+2. Either add MapLibre GitHub distribution URL (https://github.com/maplibre/maplibre-gl-native-distribution) or search for `maplibre-gl-native` package.

 3. Choose "next". Xcode should clone the distribution repository and download the binaries.

@@ -68,7 +68,7 @@ You can also download pre-build from releases in this repository.
 ### Source code checkout

 ```bash
-git clone --recurse-submodules https://github.com/maptiler/maplibre-gl-native.git
+git clone --recurse-submodules https://github.com/maplibre/maplibre-gl-native.git
 ```

 ### Build
--- a/platform/android/docker/README.md
+++ b/platform/android/docker/README.md
@@ -1,5 +1,5 @@

 ```
-docker build -t maptiler/android-base -f android-base .
-docker build -t maptiler/android-ndk-r21b -f android-ndk-r21b .
+docker build -t maplibre/android-base -f android-base .
+docker build -t maplibre/android-ndk-r21b -f android-ndk-r21b .
 ```
--- a/platform/android/gradle/artifact-settings.gradle
+++ b/platform/android/gradle/artifact-settings.gradle
@@ -5,9 +5,9 @@ ext {
    mapboxArtifactDescription = 'MapLibre Maps SDK for Android'
    mapboxDeveloperName = 'MapLibre'
    mapboxDeveloperId = 'maplibre'
-    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'
+    mapboxArtifactUrl = 'https://github.com/maplibre/maplibre-gl-native'
+    mapboxArtifactVcsUrl = 'https://github.com/maplibre/maplibre-gl-native.git'
+    mapboxArtifactScmUrl = 'scm:git@github.com:maplibre/maplibre-gl-native.git'
    mapboxArtifactLicenseName = 'BSD'
    mapboxArtifactLicenseUrl = 'https://opensource.org/licenses/BSD-2-Clause'
    mapboxPackageRepository = 'https://maven.pkg.github.com/maptiler/maplibre-gl-native'
--- a/platform/ios/platform/ios/scripts/deploy-swift-package.sh
+++ b/platform/ios/platform/ios/scripts/deploy-swift-package.sh
@@ -16,10 +16,10 @@ function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
 function finish { >&2 echo -en "\033[0m"; }
 trap finish EXIT

-export GITHUB_USER=maptiler
+export GITHUB_USER=maplibre
 export GITHUB_REPO=maplibre-gl-native
 export BUILDTYPE=Release
-export DISTRIBUTION_GITHUB_REPO=https://api.github.com/repos/maptiler/maplibre-gl-native-distribution
+export DISTRIBUTION_GITHUB_REPO=https://api.github.com/repos/maplibre/maplibre-gl-native-distribution

 VERSION_TAG=${VERSION_TAG:-''}
 PUBLISH_VERSION=
--- a/platform/ios/platform/ios/scripts/package.sh
+++ b/platform/ios/platform/ios/scripts/package.sh
@@ -59,7 +59,7 @@ fi

 step "Recording library version…"
 VERSION="${OUTPUT}"/version.txt
-echo -n "https://github.com/maptiler/maplibre-gl-native/commit/" > ${VERSION}
+echo -n "https://github.com/maplibre/maplibre-gl-native/commit/" > ${VERSION}
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
 echo -n "maplibre-gl-native-ios "
 echo ${HASH}
--- a/platform/ios/platform/ios/scripts/xcpackage.sh
+++ b/platform/ios/platform/ios/scripts/xcpackage.sh
@@ -41,7 +41,7 @@ mkdir -p ${BINOUT}

 step "Recording library version…"
 VERSION="${OUTPUT}"/version.txt
-echo -n "https://github.com/maptiler/maplibre-gl-native/commit/" > ${VERSION}
+echo -n "https://github.com/maplibre/maplibre-gl-native/commit/" > ${VERSION}
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
 echo -n "maplibre-gl-native-ios "
 echo ${HASH}
--- a/platform/ios/platform/macos/scripts/deploy-packages.sh
+++ b/platform/ios/platform/macos/scripts/deploy-packages.sh
@@ -76,7 +76,7 @@ publish() {
    fi
 }

-export GITHUB_USER=maptiler
+export GITHUB_USER=maplibre
 export GITHUB_REPO=maplibre-gl-native
 export BUILDTYPE=Release

--- a/platform/ios/scripts/environment.js
+++ b/platform/ios/scripts/environment.js
@@ -10,7 +10,7 @@ const pr = process.env['GITHUB_PULL_REQUEST'];
 if (pr) {
    const number = +pr.match(/\/(\d+)\/?$/)[1];
    return github.pullRequests.get({
-        owner: 'maptiler',
+        owner: 'maplibre',
        repo: 'maplibre-gl-native',
        number
    }).then(({data}) => {