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

Use public packages #14

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Use public packages #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ceaae5
Misc fixups
mbalfour-amzn Oct 29, 2024
c233b92
Changed kotlin demo app to use released package.
mbalfour-amzn Oct 29, 2024
3625df7
Change Swift demo to use released package.
mbalfour-amzn Oct 29, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
**/*.iml
**/.gradle
**/.env
**/.env.save
**/local.properties
**/captures
**/.externalNativeBuild
Expand Down
6 changes: 6 additions & 0 deletions javascript/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.idea
/.vscode
/dist
/node_modules
/coverage
/package-lock.json
2 changes: 1 addition & 1 deletion javascript/demo/polyline-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<body>
<div id="map" />
<script src="https://unpkg.com/maplibre-gl/dist/maplibre-gl.js"></script>
<script src="../dist/polyline.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@aws/polyline"></script>

<script>
// Create a simple map using the default MapLibre demo tiles.
Expand Down
4 changes: 2 additions & 2 deletions javascript/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@aws/polyline",
"description": "A library for encoding and decoding polylines",
"version": "0.1.0",
"version": "0.1.1",
"keywords": [],
"author": {
"name": "Amazon Web Services",
Expand Down
4 changes: 2 additions & 2 deletions kotlin/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.activity)
implementation(libs.androidx.constraintlayout)
implementation(project(":polyline"))
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)

implementation("org.maplibre.gl:android-sdk:11.3.0")
implementation("org.maplibre.gl:android-sdk:11.5.2")
implementation("software.amazon.location:polyline:0.1.0")
}
2 changes: 1 addition & 1 deletion kotlin/polyline/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
publishing {
repositories {
maven {
name = "Polyline"
name = "polyline"
url = uri("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials(PasswordCredentials::class)
}
Expand Down
30 changes: 15 additions & 15 deletions swift/PolylineDemo/PolylineDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
6817D5942CB9D76F00078BB3 /* Polyline in Frameworks */ = {isa = PBXBuildFile; productRef = 6817D5932CB9D76F00078BB3 /* Polyline */; };
6817D5972CB9D79B00078BB3 /* MapLibre in Frameworks */ = {isa = PBXBuildFile; productRef = 6817D5962CB9D79B00078BB3 /* MapLibre */; };
685E1E472CAEF07000F2C626 /* PolylineDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 685E1E462CAEF07000F2C626 /* PolylineDemoApp.swift */; };
685E1E492CAEF07000F2C626 /* SimpleMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 685E1E482CAEF07000F2C626 /* SimpleMap.swift */; };
685E1E4B2CAEF07100F2C626 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 685E1E4A2CAEF07100F2C626 /* Assets.xcassets */; };
685E1E4E2CAEF07100F2C626 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 685E1E4D2CAEF07100F2C626 /* Preview Assets.xcassets */; };
688CCE352CD18730001D9E4D /* Polyline in Frameworks */ = {isa = PBXBuildFile; productRef = 688CCE342CD18730001D9E4D /* Polyline */; };
68AE0BB32CB894B600AF75CF /* Polyline in Frameworks */ = {isa = PBXBuildFile; productRef = 68AE0BB22CB894B600AF75CF /* Polyline */; };
68AE0BB62CB968FE00AF75CF /* Polyline in Frameworks */ = {isa = PBXBuildFile; productRef = 68AE0BB52CB968FE00AF75CF /* Polyline */; };
68AE0BB92CB9695100AF75CF /* Polyline in Frameworks */ = {isa = PBXBuildFile; productRef = 68AE0BB82CB9695100AF75CF /* Polyline */; };
Expand All @@ -35,7 +35,7 @@
6817D5972CB9D79B00078BB3 /* MapLibre in Frameworks */,
68AE0BB32CB894B600AF75CF /* Polyline in Frameworks */,
68AE0BB62CB968FE00AF75CF /* Polyline in Frameworks */,
6817D5942CB9D76F00078BB3 /* Polyline in Frameworks */,
688CCE352CD18730001D9E4D /* Polyline in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -97,8 +97,8 @@
68AE0BB22CB894B600AF75CF /* Polyline */,
68AE0BB52CB968FE00AF75CF /* Polyline */,
68AE0BB82CB9695100AF75CF /* Polyline */,
6817D5932CB9D76F00078BB3 /* Polyline */,
6817D5962CB9D79B00078BB3 /* MapLibre */,
688CCE342CD18730001D9E4D /* Polyline */,
);
productName = PolylineDemo;
productReference = 685E1E432CAEF07000F2C626 /* PolylineDemo.app */;
Expand Down Expand Up @@ -129,8 +129,8 @@
);
mainGroup = 685E1E3A2CAEF07000F2C626;
packageReferences = (
6817D5922CB9D76E00078BB3 /* XCRemoteSwiftPackageReference "polyline" */,
6817D5952CB9D79B00078BB3 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */,
688CCE332CD18730001D9E4D /* XCRemoteSwiftPackageReference "polyline" */,
);
productRefGroup = 685E1E442CAEF07000F2C626 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -367,35 +367,35 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
6817D5922CB9D76E00078BB3 /* XCRemoteSwiftPackageReference "polyline" */ = {
6817D5952CB9D79B00078BB3 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/aws-geospatial/polyline";
repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.2.0;
minimumVersion = 6.7.1;
};
};
6817D5952CB9D79B00078BB3 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */ = {
688CCE332CD18730001D9E4D /* XCRemoteSwiftPackageReference "polyline" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution";
repositoryURL = "https://github.com/aws-geospatial/polyline";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.7.1;
minimumVersion = 0.2.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
6817D5932CB9D76F00078BB3 /* Polyline */ = {
isa = XCSwiftPackageProductDependency;
package = 6817D5922CB9D76E00078BB3 /* XCRemoteSwiftPackageReference "polyline" */;
productName = Polyline;
};
6817D5962CB9D79B00078BB3 /* MapLibre */ = {
isa = XCSwiftPackageProductDependency;
package = 6817D5952CB9D79B00078BB3 /* XCRemoteSwiftPackageReference "maplibre-gl-native-distribution" */;
productName = MapLibre;
};
688CCE342CD18730001D9E4D /* Polyline */ = {
isa = XCSwiftPackageProductDependency;
package = 688CCE332CD18730001D9E4D /* XCRemoteSwiftPackageReference "polyline" */;
productName = Polyline;
};
68AE0BB22CB894B600AF75CF /* Polyline */ = {
isa = XCSwiftPackageProductDependency;
productName = Polyline;
Expand Down
Loading