Change package prefix from com.mapbox to org.maplibre (#30)

* Fix build.yml * Change package prefix from to
maplibre · Apr 5, 2024 · f88938f · f88938f
1 parent ab431b3
commit f88938f
Show file tree

Hide file tree

Showing 80 changed files with 257 additions and 263 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,8 +47,8 @@ jobs:
         id: github_release
         uses: softprops/action-gh-release@v1
         with:
-          name: ${{ env.version }}
-          tag_name: ${{ env.version }}
+          name: ${{ env.VERSION }}
+          tag_name: ${{ env.VERSION }}
 
       - name: Prepare PGP Keyring file
         if: env.make_release

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,6 @@
-## Changelog for the Mapbox Java SDK
+## Changelog for MapLibre Java <= 5.9.0
 
-Mapbox welcomes participation and contributions from everyone.
-
-### main
+Releases after 5.9.0 have an auto-generated changelog.
 
 ### 5.9.0 - May 5, 2021
 - Initial MapLibre release

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.9.2
+6.0.0
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/internal/typeadapters/package-info.java b/services-geojson/src/main/java/com/mapbox/geojson/internal/typeadapters/package-info.java
diff --git a/...x/geojson/BaseCoordinatesTypeAdapter.java → ...e/geojson/BaseCoordinatesTypeAdapter.java b/...x/geojson/BaseCoordinatesTypeAdapter.java → ...e/geojson/BaseCoordinatesTypeAdapter.java
@@ -1,14 +1,14 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
-import com.mapbox.geojson.shifter.CoordinateShifterManager;
-import com.mapbox.geojson.utils.GeoJsonUtils;
+import org.maplibre.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.shifter.CoordinateShifterManager;
+import org.maplibre.geojson.utils.GeoJsonUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...pbox/geojson/BaseGeometryTypeAdapter.java → ...ibre/geojson/BaseGeometryTypeAdapter.java b/...pbox/geojson/BaseGeometryTypeAdapter.java → ...ibre/geojson/BaseGeometryTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
@@ -7,8 +7,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
-import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
+import org.maplibre.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.gson.BoundingBoxTypeAdapter;
 
 import java.io.IOException;
 

diff --git a/.../java/com/mapbox/geojson/BoundingBox.java → ...ava/org/maplibre/geojson/BoundingBox.java b/.../java/com/mapbox/geojson/BoundingBox.java → ...ava/org/maplibre/geojson/BoundingBox.java
@@ -1,16 +1,16 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
-import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LATITUDE;
-import static com.mapbox.geojson.constants.GeoJsonConstants.MIN_LONGITUDE;
+import static org.maplibre.geojson.constants.GeoJsonConstants.MIN_LATITUDE;
+import static org.maplibre.geojson.constants.GeoJsonConstants.MIN_LONGITUDE;
 
 import androidx.annotation.FloatRange;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
-import com.mapbox.geojson.constants.GeoJsonConstants;
-import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
+import org.maplibre.geojson.constants.GeoJsonConstants;
+import org.maplibre.geojson.gson.BoundingBoxTypeAdapter;
 
 import java.io.Serializable;
 

diff --git a/...m/mapbox/geojson/CoordinateContainer.java → ...maplibre/geojson/CoordinateContainer.java b/...m/mapbox/geojson/CoordinateContainer.java → ...maplibre/geojson/CoordinateContainer.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 

diff --git a/...main/java/com/mapbox/geojson/Feature.java → ...in/java/org/maplibre/geojson/Feature.java b/...main/java/com/mapbox/geojson/Feature.java → ...in/java/org/maplibre/geojson/Feature.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -14,8 +14,8 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
-import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.BoundingBoxTypeAdapter;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 

diff --git a/...com/mapbox/geojson/FeatureCollection.java → ...g/maplibre/geojson/FeatureCollection.java b/...com/mapbox/geojson/FeatureCollection.java → ...g/maplibre/geojson/FeatureCollection.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -11,8 +11,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.BoundingBoxTypeAdapter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.BoundingBoxTypeAdapter;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...main/java/com/mapbox/geojson/GeoJson.java → ...in/java/org/maplibre/geojson/GeoJson.java b/...main/java/com/mapbox/geojson/GeoJson.java → ...in/java/org/maplibre/geojson/GeoJson.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 

diff --git a/...ain/java/com/mapbox/geojson/Geometry.java → ...n/java/org/maplibre/geojson/Geometry.java b/...ain/java/com/mapbox/geojson/Geometry.java → ...n/java/org/maplibre/geojson/Geometry.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 

diff --git a/...apbox/geojson/GeometryAdapterFactory.java → ...libre/geojson/GeometryAdapterFactory.java b/...apbox/geojson/GeometryAdapterFactory.java → ...libre/geojson/GeometryAdapterFactory.java
@@ -1,10 +1,10 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.TypeAdapterFactory;
 
-import com.mapbox.geojson.internal.typeadapters.RuntimeTypeAdapterFactory;
+import org.maplibre.geojson.internal.typeadapters.RuntimeTypeAdapterFactory;
 
 /**
  * A Geometry type adapter factory for convenience for serialization/deserialization.

diff --git a/...om/mapbox/geojson/GeometryCollection.java → .../maplibre/geojson/GeometryCollection.java b/...om/mapbox/geojson/GeometryCollection.java → .../maplibre/geojson/GeometryCollection.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -11,7 +11,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...n/java/com/mapbox/geojson/LineString.java → ...java/org/maplibre/geojson/LineString.java b/...n/java/com/mapbox/geojson/LineString.java → ...java/org/maplibre/geojson/LineString.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -8,8 +8,8 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
-import com.mapbox.geojson.utils.PolylineUtils;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.utils.PolylineUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/.../ListOfDoublesCoordinatesTypeAdapter.java → .../ListOfDoublesCoordinatesTypeAdapter.java b/.../ListOfDoublesCoordinatesTypeAdapter.java → .../ListOfDoublesCoordinatesTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 

diff --git a/...tOfListOfPointCoordinatesTypeAdapter.java → ...tOfListOfPointCoordinatesTypeAdapter.java b/...tOfListOfPointCoordinatesTypeAdapter.java → ...tOfListOfPointCoordinatesTypeAdapter.java
@@ -1,11 +1,11 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.exception.GeoJsonException;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...on/ListOfPointCoordinatesTypeAdapter.java → ...on/ListOfPointCoordinatesTypeAdapter.java b/...on/ListOfPointCoordinatesTypeAdapter.java → ...on/ListOfPointCoordinatesTypeAdapter.java
@@ -1,11 +1,11 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.exception.GeoJsonException;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...tofListOfPointCoordinatesTypeAdapter.java → ...tofListOfPointCoordinatesTypeAdapter.java b/...tofListOfPointCoordinatesTypeAdapter.java → ...tofListOfPointCoordinatesTypeAdapter.java
@@ -1,11 +1,11 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.exception.GeoJsonException;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...a/com/mapbox/geojson/MultiLineString.java → ...org/maplibre/geojson/MultiLineString.java b/...a/com/mapbox/geojson/MultiLineString.java → ...org/maplibre/geojson/MultiLineString.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -8,7 +8,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...n/java/com/mapbox/geojson/MultiPoint.java → ...java/org/maplibre/geojson/MultiPoint.java b/...n/java/com/mapbox/geojson/MultiPoint.java → ...java/org/maplibre/geojson/MultiPoint.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -8,7 +8,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...java/com/mapbox/geojson/MultiPolygon.java → ...va/org/maplibre/geojson/MultiPolygon.java b/...java/com/mapbox/geojson/MultiPolygon.java → ...va/org/maplibre/geojson/MultiPolygon.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -8,7 +8,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...c/main/java/com/mapbox/geojson/Point.java → ...main/java/org/maplibre/geojson/Point.java b/...c/main/java/com/mapbox/geojson/Point.java → ...main/java/org/maplibre/geojson/Point.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -8,8 +8,8 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
-import com.mapbox.geojson.shifter.CoordinateShifterManager;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.shifter.CoordinateShifterManager;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/...eojson/PointAsCoordinatesTypeAdapter.java → ...eojson/PointAsCoordinatesTypeAdapter.java b/...eojson/PointAsCoordinatesTypeAdapter.java → ...eojson/PointAsCoordinatesTypeAdapter.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 

diff --git a/...main/java/com/mapbox/geojson/Polygon.java → ...in/java/org/maplibre/geojson/Polygon.java b/...main/java/com/mapbox/geojson/Polygon.java → ...in/java/org/maplibre/geojson/Polygon.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson;
+package org.maplibre.geojson;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -10,8 +10,8 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.exception.GeoJsonException;
-import com.mapbox.geojson.gson.GeoJsonAdapterFactory;
+import org.maplibre.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.gson.GeoJsonAdapterFactory;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...x/geojson/constants/GeoJsonConstants.java → ...e/geojson/constants/GeoJsonConstants.java b/...x/geojson/constants/GeoJsonConstants.java → ...e/geojson/constants/GeoJsonConstants.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson.constants;
+package org.maplibre.geojson.constants;
 
 /**
  * Contains constants used throughout the GeoJson classes.

diff --git a/...apbox/geojson/constants/package-info.java → ...libre/geojson/constants/package-info.java b/...apbox/geojson/constants/package-info.java → ...libre/geojson/constants/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Contains the constants used throughout the GeoJson classes.
  */
-package com.mapbox.geojson.constants;
+package org.maplibre.geojson.constants;
diff --git a/...x/geojson/exception/GeoJsonException.java → ...e/geojson/exception/GeoJsonException.java b/...x/geojson/exception/GeoJsonException.java → ...e/geojson/exception/GeoJsonException.java
@@ -1,4 +1,4 @@
-package com.mapbox.geojson.exception;
+package org.maplibre.geojson.exception;
 
 /**
  * A form of {@code Throwable} that indicates an issue occurred during a GeoJSON operation.

diff --git a/...apbox/geojson/exception/package-info.java → ...libre/geojson/exception/package-info.java b/...apbox/geojson/exception/package-info.java → ...libre/geojson/exception/package-info.java
@@ -3,4 +3,4 @@
  *
  * @since 3.0.0
  */
-package com.mapbox.geojson.exception;
+package org.maplibre.geojson.exception;
diff --git a/.../geojson/gson/BoundingBoxTypeAdapter.java → .../geojson/gson/BoundingBoxTypeAdapter.java b/.../geojson/gson/BoundingBoxTypeAdapter.java → .../geojson/gson/BoundingBoxTypeAdapter.java
@@ -1,15 +1,15 @@
-package com.mapbox.geojson.gson;
+package org.maplibre.geojson.gson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import com.mapbox.geojson.BoundingBox;
-import com.mapbox.geojson.Point;
-import com.mapbox.geojson.exception.GeoJsonException;
-import com.mapbox.geojson.shifter.CoordinateShifterManager;
-import com.mapbox.geojson.utils.GeoJsonUtils;
+import org.maplibre.geojson.BoundingBox;
+import org.maplibre.geojson.Point;
+import org.maplibre.geojson.exception.GeoJsonException;
+import org.maplibre.geojson.shifter.CoordinateShifterManager;
+import org.maplibre.geojson.utils.GeoJsonUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...x/geojson/gson/GeoJsonAdapterFactory.java → ...e/geojson/gson/GeoJsonAdapterFactory.java b/...x/geojson/gson/GeoJsonAdapterFactory.java → ...e/geojson/gson/GeoJsonAdapterFactory.java
@@ -1,21 +1,21 @@
-package com.mapbox.geojson.gson;
+package org.maplibre.geojson.gson;
 
 import androidx.annotation.Keep;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
-import com.mapbox.geojson.BoundingBox;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.geojson.GeometryCollection;
-import com.mapbox.geojson.LineString;
-import com.mapbox.geojson.MultiLineString;
-import com.mapbox.geojson.MultiPoint;
-import com.mapbox.geojson.MultiPolygon;
-import com.mapbox.geojson.Point;
-import com.mapbox.geojson.Polygon;
+import org.maplibre.geojson.BoundingBox;
+import org.maplibre.geojson.Feature;
+import org.maplibre.geojson.FeatureCollection;
+import org.maplibre.geojson.GeometryCollection;
+import org.maplibre.geojson.LineString;
+import org.maplibre.geojson.MultiLineString;
+import org.maplibre.geojson.MultiPoint;
+import org.maplibre.geojson.MultiPolygon;
+import org.maplibre.geojson.Point;
+import org.maplibre.geojson.Polygon;
 
 /**
  * A GeoJson type adapter factory for convenience for