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

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

Merged
merged 2 commits into from
Apr 5, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eabaadd
Fix build.yml
louwers Apr 5, 2024
ec66d97
Change package prefix from to
louwers Apr 5, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.9.2
6.0.0
5 changes: 0 additions & 5 deletions services-geojson/src/main/java/com/mapbox/geojson/internal/typeadapters/package-info.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions ...x/geojson/BaseCoordinatesTypeAdapter.java → ...e/geojson/BaseCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...pbox/geojson/BaseGeometryTypeAdapter.java → ...ibre/geojson/BaseGeometryTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand All @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions .../java/com/mapbox/geojson/BoundingBox.java → ...ava/org/maplibre/geojson/BoundingBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...m/mapbox/geojson/CoordinateContainer.java → ...maplibre/geojson/CoordinateContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/mapbox/geojson/Feature.java → ...in/java/org/maplibre/geojson/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...com/mapbox/geojson/FeatureCollection.java → ...g/maplibre/geojson/FeatureCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/mapbox/geojson/GeoJson.java → ...in/java/org/maplibre/geojson/GeoJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/mapbox/geojson/Geometry.java → ...n/java/org/maplibre/geojson/Geometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand Down
4 changes: 2 additions & 2 deletions ...apbox/geojson/GeometryAdapterFactory.java → ...libre/geojson/GeometryAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...om/mapbox/geojson/GeometryCollection.java → .../maplibre/geojson/GeometryCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...n/java/com/mapbox/geojson/LineString.java → ...java/org/maplibre/geojson/LineString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../ListOfDoublesCoordinatesTypeAdapter.java → .../ListOfDoublesCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand Down
4 changes: 2 additions & 2 deletions ...tOfListOfPointCoordinatesTypeAdapter.java → ...tOfListOfPointCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...on/ListOfPointCoordinatesTypeAdapter.java → ...on/ListOfPointCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...tofListOfPointCoordinatesTypeAdapter.java → ...tofListOfPointCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...a/com/mapbox/geojson/MultiLineString.java → ...org/maplibre/geojson/MultiLineString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/mapbox/geojson/MultiPoint.java → ...java/org/maplibre/geojson/MultiPoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...java/com/mapbox/geojson/MultiPolygon.java → ...va/org/maplibre/geojson/MultiPolygon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/com/mapbox/geojson/Point.java → ...main/java/org/maplibre/geojson/Point.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...eojson/PointAsCoordinatesTypeAdapter.java → ...eojson/PointAsCoordinatesTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;

Expand Down
6 changes: 3 additions & 3 deletions ...main/java/com/mapbox/geojson/Polygon.java → ...in/java/org/maplibre/geojson/Polygon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson;
package org.maplibre.geojson;

import androidx.annotation.Keep;
import androidx.annotation.NonNull;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...x/geojson/constants/GeoJsonConstants.java → ...e/geojson/constants/GeoJsonConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.mapbox.geojson.constants;
package org.maplibre.geojson.constants;

/**
* Contains constants used throughout the GeoJson classes.
Expand Down
2 changes: 1 addition & 1 deletion ...apbox/geojson/constants/package-info.java → ...libre/geojson/constants/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* Contains the constants used throughout the GeoJson classes.
*/
package com.mapbox.geojson.constants;
package org.maplibre.geojson.constants;
2 changes: 1 addition & 1 deletion ...x/geojson/exception/GeoJsonException.java → ...e/geojson/exception/GeoJsonException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...apbox/geojson/exception/package-info.java → ...libre/geojson/exception/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
*
* @since 3.0.0
*/
package com.mapbox.geojson.exception;
package org.maplibre.geojson.exception;
12 changes: 6 additions & 6 deletions .../geojson/gson/BoundingBoxTypeAdapter.java → .../geojson/gson/BoundingBoxTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
22 changes: 11 additions & 11 deletions ...x/geojson/gson/GeoJsonAdapterFactory.java → ...e/geojson/gson/GeoJsonAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading