diff --git a/.gitmodules b/.gitmodules index 01024092..ffcbfa08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ -[submodule "library/src/main/assets/styles/bubble-wrap"] - path = library/src/main/assets/styles/bubble-wrap +[submodule "mapzen-android-sdk/src/main/assets/styles/bubble-wrap"] + path = mapzen-android-sdk/src/main/assets/styles/bubble-wrap url = https://github.com/tangrams/bubble-wrap.git -[submodule "library/src/main/assets/styles/refill-more-labels"] - path = library/src/main/assets/styles/refill-more-labels +[submodule "mapzen-android-sdk/src/main/assets/styles/refill-more-labels"] + path = mapzen-android-sdk/src/main/assets/styles/refill-more-labels url = https://github.com/tangrams/refill-style-more-labels.git -[submodule "library/src/main/assets/styles/cinnabar-more-labels"] - path = library/src/main/assets/styles/cinnabar-more-labels +[submodule "mapzen-android-sdk/src/main/assets/styles/cinnabar-more-labels"] + path = mapzen-android-sdk/src/main/assets/styles/cinnabar-more-labels url = https://github.com/tangrams/cinnabar-style-more-labels.git -[submodule "library/src/main/assets/styles/walkabout-style-more-labels"] - path = library/src/main/assets/styles/walkabout-style-more-labels +[submodule "mapzen-android-sdk/src/main/assets/styles/walkabout-style-more-labels"] + path = mapzen-android-sdk/src/main/assets/styles/walkabout-style-more-labels url = https://github.com/tangrams/walkabout-style-more-labels.git -[submodule "library/src/main/assets/styles/zinc-style-more-labels"] - path = library/src/main/assets/styles/zinc-style-more-labels +[submodule "mapzen-android-sdk/src/main/assets/styles/zinc-style-more-labels"] + path = mapzen-android-sdk/src/main/assets/styles/zinc-style-more-labels url = https://github.com/tangrams/zinc-style-more-labels.git diff --git a/README.md b/README.md index 9128d326..04126e1c 100644 --- a/README.md +++ b/README.md @@ -33,4 +33,4 @@ The Mapzen Android SDK incorporates several stand-alone libraries for map render - [Lost](https://github.com/mapzen/lost)- Drop-in replacement for Google Play services Location APIs ## Sample -For a working example please refer to the SDK [sample app](https://github.com/mapzen/android/tree/master/sample). +For a working example please refer to the SDK [sample app](https://github.com/mapzen/android/tree/master/mapzen-android-sdk-sample). diff --git a/build.gradle b/build.gradle index d5548903..e2381177 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/circle.yml b/circle.yml index dc60589e..208e5b35 100644 --- a/circle.yml +++ b/circle.yml @@ -26,8 +26,8 @@ deployment: branch: master commands: - ./gradlew uploadArchives -PsonatypeUsername=$SONATYPE_NEXUS_SNAPSHOTS_USERNAME -PsonatypePassword=$SONATYPE_NEXUS_SNAPSHOTS_PASSWORD - - scripts/deploy-sample-app.sh - - ./gradlew aarSize countReleaseDexMethods permissions library:dependencies --configuration compile + - scripts/deploy-android-sdk-sample-app.sh + - scripts/deploy-places-api-sample-app.sh + - ./gradlew aarSize countReleaseDexMethods permissions mapzen-android-sdk:dependencies --configuration compile - pip install 'Circle-Tickler == 1.0.1' - tickle-circle mapzen mapzen-docs-generator master $CIRCLE_TOKEN - diff --git a/library/.gitignore b/core/.gitignore similarity index 100% rename from library/.gitignore rename to core/.gitignore diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 00000000..a325c3d0 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,86 @@ +buildscript { + repositories { + mavenCentral() + mavenLocal() + maven { + url 'https://plugins.gradle.org/m2/' + } + } + dependencies { + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'net.researchgate:gradle-release:2.4.0' + } +} + +apply plugin: 'com.android.library' +apply plugin: 'checkstyle' +apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'net.researchgate.release' + +group = GROUP +version = VERSION_NAME +project.archivesBaseName = POM_ARTIFACT_ID + +release { + tagTemplate = 'mapzen-core${version}' + versionPropertyFile = 'gradle.properties' + versionProperties = ['VERSION_NAME'] + newVersionCommitMessage = '[Gradle Release Plugin] - core new version commit:' +} + +afterReleaseBuild.dependsOn uploadArchives + +android { + compileSdkVersion 24 + buildToolsVersion "24.0.3" + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 24 + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + testOptions { + unitTests.returnDefaultValues = true + } + + lintOptions { + abortOnError false + } +} + +tasks.withType(Test) { + testLogging { + exceptionFormat "full" + events "started", "skipped", "passed", "failed" + showStandardStreams true + } +} + +task checkstyle(type: Checkstyle) { + configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml") + source 'src' + include '**/*.java' + exclude '**/gen/**' + + classpath = files() +} + +task verify(dependsOn: ['compileDebugSources', + 'test', + 'checkstyle', + 'lint']) + +apply from: rootProject.file('gradle/gradle-mvn-push.gradle') + +dependencies { + +} diff --git a/core/gradle.properties b/core/gradle.properties new file mode 100644 index 00000000..5f2c3020 --- /dev/null +++ b/core/gradle.properties @@ -0,0 +1,22 @@ +version=0.0.1-SNAPSHOT + +POM_ARTIFACT_ID=mapzen-core +POM_NAME=Mapzen Android Core +POM_PACKAGING=aar + +GROUP=com.mapzen +VERSION_NAME=0.0.1-SNAPSHOT + +POM_DESCRIPTION=Core classes used by the Mapzen Android SDK and Mapzen Places API. + +POM_URL=https://github.com/mapzen/android +POM_SCM_URL=http://github.com/mapzen/android +POM_SCM_CONNECTION=scm:git:git://github.com/mapzen/android.git +POM_SCM_DEV_CONNECTION=scm:git:git@github.com:mapzen/android.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_ID=Mapzen +POM_DEVELOPER_NAME=Mapzen diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro new file mode 100644 index 00000000..fe837ffb --- /dev/null +++ b/core/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/sarahlensing/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml new file mode 100644 index 00000000..adc390ce --- /dev/null +++ b/core/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml new file mode 100644 index 00000000..11293ffb --- /dev/null +++ b/core/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + core + diff --git a/sample/.gitignore b/mapzen-android-sdk/.gitignore similarity index 100% rename from sample/.gitignore rename to mapzen-android-sdk/.gitignore diff --git a/library/build.gradle b/mapzen-android-sdk/build.gradle similarity index 91% rename from library/build.gradle rename to mapzen-android-sdk/build.gradle index b4a64fe8..92ca35db 100644 --- a/library/build.gradle +++ b/mapzen-android-sdk/build.gradle @@ -26,9 +26,10 @@ version = VERSION_NAME project.archivesBaseName = POM_ARTIFACT_ID release { - tagTemplate = 'v${version}' - versionPropertyFile = '../gradle.properties' + tagTemplate = 'mapzen-android-sdk${version}' + versionPropertyFile = 'gradle.properties' versionProperties = ['VERSION_NAME'] + newVersionCommitMessage = '[Gradle Release Plugin] - mapzen-android-sdk new version commit:' } afterReleaseBuild.dependsOn uploadArchives @@ -83,7 +84,7 @@ task verify(dependsOn: ['compileDebugSources', 'lint']) task submodules { - def folder = new File( 'library/src/main/assets/styles/walkabout-style-more-labels/walkabout-style-more-labels.yaml' ) + def folder = new File( 'mapzen-android-sdk/src/main/assets/styles/walkabout-style-more-labels/walkabout-style-more-labels.yaml' ) if(!folder.exists()) { throw new GradleException("Submodules aren't present, please run:\n`git submodule init`, " + "\n`git submodule update`\nfrom your root directory") @@ -97,6 +98,8 @@ assemble.doFirst { dependencies { compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.mapzen:mapzen-core:0.0.1-SNAPSHOT' + compile "com.mapzen.tangram:tangram:$tangram_version" compile 'com.mapzen.android:lost:2.1.2' compile 'com.mapzen:on-the-road:1.1.1' diff --git a/gradle.properties b/mapzen-android-sdk/gradle.properties similarity index 100% rename from gradle.properties rename to mapzen-android-sdk/gradle.properties diff --git a/library/proguard-rules.pro b/mapzen-android-sdk/proguard-rules.pro similarity index 100% rename from library/proguard-rules.pro rename to mapzen-android-sdk/proguard-rules.pro diff --git a/library/src/main/AndroidManifest.xml b/mapzen-android-sdk/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to mapzen-android-sdk/src/main/AndroidManifest.xml diff --git a/library/src/main/assets/styles/bubble-wrap b/mapzen-android-sdk/src/main/assets/styles/bubble-wrap similarity index 100% rename from library/src/main/assets/styles/bubble-wrap rename to mapzen-android-sdk/src/main/assets/styles/bubble-wrap diff --git a/library/src/main/assets/styles/cinnabar-more-labels b/mapzen-android-sdk/src/main/assets/styles/cinnabar-more-labels similarity index 100% rename from library/src/main/assets/styles/cinnabar-more-labels rename to mapzen-android-sdk/src/main/assets/styles/cinnabar-more-labels diff --git a/library/src/main/assets/styles/refill-more-labels b/mapzen-android-sdk/src/main/assets/styles/refill-more-labels similarity index 100% rename from library/src/main/assets/styles/refill-more-labels rename to mapzen-android-sdk/src/main/assets/styles/refill-more-labels diff --git a/library/src/main/assets/styles/walkabout-style-more-labels b/mapzen-android-sdk/src/main/assets/styles/walkabout-style-more-labels similarity index 100% rename from library/src/main/assets/styles/walkabout-style-more-labels rename to mapzen-android-sdk/src/main/assets/styles/walkabout-style-more-labels diff --git a/library/src/main/assets/styles/zinc-style-more-labels b/mapzen-android-sdk/src/main/assets/styles/zinc-style-more-labels similarity index 100% rename from library/src/main/assets/styles/zinc-style-more-labels rename to mapzen-android-sdk/src/main/assets/styles/zinc-style-more-labels diff --git a/library/src/main/java/com/mapzen/android/core/AndroidModule.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/core/AndroidModule.java similarity index 100% rename from library/src/main/java/com/mapzen/android/core/AndroidModule.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/core/AndroidModule.java diff --git a/library/src/main/java/com/mapzen/android/core/ApiKeyConstants.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/core/ApiKeyConstants.java similarity index 100% rename from library/src/main/java/com/mapzen/android/core/ApiKeyConstants.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/core/ApiKeyConstants.java diff --git a/library/src/main/java/com/mapzen/android/core/CommonModule.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/core/CommonModule.java similarity index 100% rename from library/src/main/java/com/mapzen/android/core/CommonModule.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/core/CommonModule.java diff --git a/library/src/main/java/com/mapzen/android/core/DI.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/core/DI.java similarity index 100% rename from library/src/main/java/com/mapzen/android/core/DI.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/core/DI.java diff --git a/library/src/main/java/com/mapzen/android/core/DependencyInjector.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/core/DependencyInjector.java similarity index 100% rename from library/src/main/java/com/mapzen/android/core/DependencyInjector.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/core/DependencyInjector.java diff --git a/library/src/main/java/com/mapzen/android/graphics/DataLayerType.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/DataLayerType.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/DataLayerType.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/DataLayerType.java diff --git a/library/src/main/java/com/mapzen/android/graphics/FeaturePickListener.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/FeaturePickListener.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/FeaturePickListener.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/FeaturePickListener.java diff --git a/library/src/main/java/com/mapzen/android/graphics/GraphicsModule.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/GraphicsModule.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/GraphicsModule.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/GraphicsModule.java diff --git a/library/src/main/java/com/mapzen/android/graphics/LabelPickHandler.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/LabelPickHandler.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/LabelPickHandler.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/LabelPickHandler.java diff --git a/library/src/main/java/com/mapzen/android/graphics/LabelPickListener.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/LabelPickListener.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/LabelPickListener.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/LabelPickListener.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapDataManager.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapDataManager.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapDataManager.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapDataManager.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapFragment.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapFragment.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapFragment.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapFragment.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapInitializer.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapInitializer.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapInitializer.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapInitializer.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapStateManager.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapStateManager.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapStateManager.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapStateManager.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapView.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapView.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapView.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapView.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapzenMap.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapzenMap.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapzenMap.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapzenMap.java diff --git a/library/src/main/java/com/mapzen/android/graphics/MapzenMapPeliasLocationProvider.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapzenMapPeliasLocationProvider.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/MapzenMapPeliasLocationProvider.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/MapzenMapPeliasLocationProvider.java diff --git a/library/src/main/java/com/mapzen/android/graphics/OnMapReadyCallback.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/OnMapReadyCallback.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/OnMapReadyCallback.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/OnMapReadyCallback.java diff --git a/library/src/main/java/com/mapzen/android/graphics/OverlayManager.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/OverlayManager.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/OverlayManager.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/OverlayManager.java diff --git a/library/src/main/java/com/mapzen/android/graphics/PersistableMapData.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/PersistableMapData.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/PersistableMapData.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/PersistableMapData.java diff --git a/library/src/main/java/com/mapzen/android/graphics/TangramMapView.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/TangramMapView.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/TangramMapView.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/TangramMapView.java diff --git a/library/src/main/java/com/mapzen/android/graphics/TileHttpHandler.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/TileHttpHandler.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/TileHttpHandler.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/TileHttpHandler.java diff --git a/library/src/main/java/com/mapzen/android/graphics/ViewCompleteListener.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/ViewCompleteListener.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/ViewCompleteListener.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/ViewCompleteListener.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/BubbleWrapStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/BubbleWrapStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/BubbleWrapStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/BubbleWrapStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/CameraType.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/CameraType.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/CameraType.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/CameraType.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/CinnabarStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/CinnabarStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/CinnabarStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/CinnabarStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/EaseType.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/EaseType.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/EaseType.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/EaseType.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/MapStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/MapStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/MapStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/MapStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/Marker.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Marker.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/Marker.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Marker.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/Polygon.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Polygon.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/Polygon.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Polygon.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/Polyline.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Polyline.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/Polyline.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/Polyline.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/RefillStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/RefillStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/RefillStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/RefillStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/TronStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/TronStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/TronStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/TronStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/WalkaboutStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/WalkaboutStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/WalkaboutStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/WalkaboutStyle.java diff --git a/library/src/main/java/com/mapzen/android/graphics/model/ZincStyle.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/ZincStyle.java similarity index 100% rename from library/src/main/java/com/mapzen/android/graphics/model/ZincStyle.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/graphics/model/ZincStyle.java diff --git a/library/src/main/java/com/mapzen/android/location/LocationFactory.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/location/LocationFactory.java similarity index 100% rename from library/src/main/java/com/mapzen/android/location/LocationFactory.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/location/LocationFactory.java diff --git a/library/src/main/java/com/mapzen/android/routing/Converter.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/routing/Converter.java similarity index 100% rename from library/src/main/java/com/mapzen/android/routing/Converter.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/routing/Converter.java diff --git a/library/src/main/java/com/mapzen/android/routing/MapzenDistanceFormatter.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/routing/MapzenDistanceFormatter.java similarity index 100% rename from library/src/main/java/com/mapzen/android/routing/MapzenDistanceFormatter.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/routing/MapzenDistanceFormatter.java diff --git a/library/src/main/java/com/mapzen/android/routing/MapzenRouter.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/routing/MapzenRouter.java similarity index 100% rename from library/src/main/java/com/mapzen/android/routing/MapzenRouter.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/routing/MapzenRouter.java diff --git a/library/src/main/java/com/mapzen/android/routing/TurnByTurnHttpHandler.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/routing/TurnByTurnHttpHandler.java similarity index 100% rename from library/src/main/java/com/mapzen/android/routing/TurnByTurnHttpHandler.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/routing/TurnByTurnHttpHandler.java diff --git a/library/src/main/java/com/mapzen/android/search/MapzenSearch.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/search/MapzenSearch.java similarity index 100% rename from library/src/main/java/com/mapzen/android/search/MapzenSearch.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/search/MapzenSearch.java diff --git a/library/src/main/java/com/mapzen/android/search/SearchInitializer.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/search/SearchInitializer.java similarity index 100% rename from library/src/main/java/com/mapzen/android/search/SearchInitializer.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/search/SearchInitializer.java diff --git a/library/src/main/java/com/mapzen/android/search/SearchRequestHandler.java b/mapzen-android-sdk/src/main/java/com/mapzen/android/search/SearchRequestHandler.java similarity index 100% rename from library/src/main/java/com/mapzen/android/search/SearchRequestHandler.java rename to mapzen-android-sdk/src/main/java/com/mapzen/android/search/SearchRequestHandler.java diff --git a/library/src/main/res/drawable-hdpi/mz_find_me_normal.png b/mapzen-android-sdk/src/main/res/drawable-hdpi/mz_find_me_normal.png similarity index 100% rename from library/src/main/res/drawable-hdpi/mz_find_me_normal.png rename to mapzen-android-sdk/src/main/res/drawable-hdpi/mz_find_me_normal.png diff --git a/library/src/main/res/drawable-hdpi/mz_find_me_pressed.png b/mapzen-android-sdk/src/main/res/drawable-hdpi/mz_find_me_pressed.png similarity index 100% rename from library/src/main/res/drawable-hdpi/mz_find_me_pressed.png rename to mapzen-android-sdk/src/main/res/drawable-hdpi/mz_find_me_pressed.png diff --git a/library/src/main/res/drawable-mdpi/mz_find_me_normal.png b/mapzen-android-sdk/src/main/res/drawable-mdpi/mz_find_me_normal.png similarity index 100% rename from library/src/main/res/drawable-mdpi/mz_find_me_normal.png rename to mapzen-android-sdk/src/main/res/drawable-mdpi/mz_find_me_normal.png diff --git a/library/src/main/res/drawable-mdpi/mz_find_me_pressed.png b/mapzen-android-sdk/src/main/res/drawable-mdpi/mz_find_me_pressed.png similarity index 100% rename from library/src/main/res/drawable-mdpi/mz_find_me_pressed.png rename to mapzen-android-sdk/src/main/res/drawable-mdpi/mz_find_me_pressed.png diff --git a/library/src/main/res/drawable-v21/mz_bg_white_gray_border.xml b/mapzen-android-sdk/src/main/res/drawable-v21/mz_bg_white_gray_border.xml similarity index 100% rename from library/src/main/res/drawable-v21/mz_bg_white_gray_border.xml rename to mapzen-android-sdk/src/main/res/drawable-v21/mz_bg_white_gray_border.xml diff --git a/library/src/main/res/drawable-xhdpi/mz_find_me_normal.png b/mapzen-android-sdk/src/main/res/drawable-xhdpi/mz_find_me_normal.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/mz_find_me_normal.png rename to mapzen-android-sdk/src/main/res/drawable-xhdpi/mz_find_me_normal.png diff --git a/library/src/main/res/drawable-xhdpi/mz_find_me_pressed.png b/mapzen-android-sdk/src/main/res/drawable-xhdpi/mz_find_me_pressed.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/mz_find_me_pressed.png rename to mapzen-android-sdk/src/main/res/drawable-xhdpi/mz_find_me_pressed.png diff --git a/library/src/main/res/drawable-xxhdpi/mz_find_me_normal.png b/mapzen-android-sdk/src/main/res/drawable-xxhdpi/mz_find_me_normal.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/mz_find_me_normal.png rename to mapzen-android-sdk/src/main/res/drawable-xxhdpi/mz_find_me_normal.png diff --git a/library/src/main/res/drawable-xxhdpi/mz_find_me_pressed.png b/mapzen-android-sdk/src/main/res/drawable-xxhdpi/mz_find_me_pressed.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/mz_find_me_pressed.png rename to mapzen-android-sdk/src/main/res/drawable-xxhdpi/mz_find_me_pressed.png diff --git a/library/src/main/res/drawable/mz_bg_ripple.xml b/mapzen-android-sdk/src/main/res/drawable/mz_bg_ripple.xml similarity index 100% rename from library/src/main/res/drawable/mz_bg_ripple.xml rename to mapzen-android-sdk/src/main/res/drawable/mz_bg_ripple.xml diff --git a/library/src/main/res/drawable/mz_bg_white_gray_border.xml b/mapzen-android-sdk/src/main/res/drawable/mz_bg_white_gray_border.xml similarity index 100% rename from library/src/main/res/drawable/mz_bg_white_gray_border.xml rename to mapzen-android-sdk/src/main/res/drawable/mz_bg_white_gray_border.xml diff --git a/library/src/main/res/drawable/mz_find_me.xml b/mapzen-android-sdk/src/main/res/drawable/mz_find_me.xml similarity index 100% rename from library/src/main/res/drawable/mz_find_me.xml rename to mapzen-android-sdk/src/main/res/drawable/mz_find_me.xml diff --git a/library/src/main/res/layout/mz_fragment_map.xml b/mapzen-android-sdk/src/main/res/layout/mz_fragment_map.xml similarity index 100% rename from library/src/main/res/layout/mz_fragment_map.xml rename to mapzen-android-sdk/src/main/res/layout/mz_fragment_map.xml diff --git a/library/src/main/res/layout/mz_view_map.xml b/mapzen-android-sdk/src/main/res/layout/mz_view_map.xml similarity index 100% rename from library/src/main/res/layout/mz_view_map.xml rename to mapzen-android-sdk/src/main/res/layout/mz_view_map.xml diff --git a/library/src/main/res/values/colors.xml b/mapzen-android-sdk/src/main/res/values/colors.xml similarity index 100% rename from library/src/main/res/values/colors.xml rename to mapzen-android-sdk/src/main/res/values/colors.xml diff --git a/library/src/main/res/values/dimens.xml b/mapzen-android-sdk/src/main/res/values/dimens.xml similarity index 100% rename from library/src/main/res/values/dimens.xml rename to mapzen-android-sdk/src/main/res/values/dimens.xml diff --git a/library/src/main/res/values/strings.xml b/mapzen-android-sdk/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to mapzen-android-sdk/src/main/res/values/strings.xml diff --git a/library/src/test/java/com/mapzen/android/TestHelper.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/TestHelper.java similarity index 100% rename from library/src/test/java/com/mapzen/android/TestHelper.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/TestHelper.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapDataManagerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapDataManagerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapDataManagerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapDataManagerTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapFragmentTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapFragmentTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapFragmentTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapFragmentTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapInitializerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapInitializerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapInitializerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapInitializerTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapStateManagerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapStateManagerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapStateManagerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapStateManagerTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapViewTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapViewTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapViewTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapViewTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/MapzenMapTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapzenMapTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/MapzenMapTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/MapzenMapTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/OverlayManagerTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/PersistableMapDataTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/PersistableMapDataTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/PersistableMapDataTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/PersistableMapDataTest.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestCallback.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestCallback.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestCallback.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestCallback.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestDoubleTapResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestDoubleTapResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestDoubleTapResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestDoubleTapResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestLongPressResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestLongPressResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestLongPressResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestLongPressResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestMapController.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestMapController.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestMapController.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestMapController.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestMapView.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestMapView.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestMapView.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestMapView.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestPanResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestPanResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestPanResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestPanResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestRotateResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestRotateResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestRotateResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestRotateResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestScaleResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestScaleResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestScaleResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestScaleResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestShoveResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestShoveResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestShoveResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestShoveResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestTangramMapView.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestTangramMapView.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestTangramMapView.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestTangramMapView.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TestTapResponder.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestTapResponder.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TestTapResponder.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TestTapResponder.java diff --git a/library/src/test/java/com/mapzen/android/graphics/TileHttpHandlerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TileHttpHandlerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/graphics/TileHttpHandlerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/graphics/TileHttpHandlerTest.java diff --git a/library/src/test/java/com/mapzen/android/location/LocationFactoryTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/location/LocationFactoryTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/location/LocationFactoryTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/location/LocationFactoryTest.java diff --git a/library/src/test/java/com/mapzen/android/routing/MapzenRouterTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/routing/MapzenRouterTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/routing/MapzenRouterTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/routing/MapzenRouterTest.java diff --git a/library/src/test/java/com/mapzen/android/search/MapzenSearchTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/search/MapzenSearchTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/search/MapzenSearchTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/search/MapzenSearchTest.java diff --git a/library/src/test/java/com/mapzen/android/search/SearchInitializerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/search/SearchInitializerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/search/SearchInitializerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/search/SearchInitializerTest.java diff --git a/library/src/test/java/com/mapzen/android/search/SearchRequestHandlerTest.java b/mapzen-android-sdk/src/test/java/com/mapzen/android/search/SearchRequestHandlerTest.java similarity index 100% rename from library/src/test/java/com/mapzen/android/search/SearchRequestHandlerTest.java rename to mapzen-android-sdk/src/test/java/com/mapzen/android/search/SearchRequestHandlerTest.java diff --git a/library/src/test/java/com/mapzen/tangram/TestMapData.java b/mapzen-android-sdk/src/test/java/com/mapzen/tangram/TestMapData.java similarity index 100% rename from library/src/test/java/com/mapzen/tangram/TestMapData.java rename to mapzen-android-sdk/src/test/java/com/mapzen/tangram/TestMapData.java diff --git a/library/src/test/java/javax/microedition/khronos/egl/EGLConfig.java b/mapzen-android-sdk/src/test/java/javax/microedition/khronos/egl/EGLConfig.java similarity index 100% rename from library/src/test/java/javax/microedition/khronos/egl/EGLConfig.java rename to mapzen-android-sdk/src/test/java/javax/microedition/khronos/egl/EGLConfig.java diff --git a/library/src/test/java/javax/microedition/khronos/opengles/GL10.java b/mapzen-android-sdk/src/test/java/javax/microedition/khronos/opengles/GL10.java similarity index 100% rename from library/src/test/java/javax/microedition/khronos/opengles/GL10.java rename to mapzen-android-sdk/src/test/java/javax/microedition/khronos/opengles/GL10.java diff --git a/mapzen-places-api/.gitignore b/mapzen-places-api/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/mapzen-places-api/.gitignore @@ -0,0 +1 @@ +/build diff --git a/mapzen-places-api/build.gradle b/mapzen-places-api/build.gradle new file mode 100644 index 00000000..0d4cb4d0 --- /dev/null +++ b/mapzen-places-api/build.gradle @@ -0,0 +1,73 @@ +buildscript { + repositories { + mavenCentral() + mavenLocal() + maven { + url 'https://plugins.gradle.org/m2/' + } + } + dependencies { + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' + classpath 'net.researchgate:gradle-release:2.4.0' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1' + } +} + +apply plugin: 'com.android.library' +apply plugin: 'checkstyle' +apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'net.researchgate.release' + +group = GROUP +version = VERSION_NAME +project.archivesBaseName = POM_ARTIFACT_ID + +release { + tagTemplate = 'mapzen-places-api-${version}' + versionPropertyFile = 'gradle.properties' + versionProperties = ['VERSION_NAME'] + newVersionCommitMessage = '[Gradle Release Plugin] - mapzen-places-api new version commit:' +} + +afterReleaseBuild.dependsOn uploadArchives + + +android { + compileSdkVersion 24 + buildToolsVersion "24.0.3" + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 24 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + testOptions { + unitTests.returnDefaultValues = true + } +} + +tasks.withType(Test) { + testLogging { + exceptionFormat "full" + events "started", "skipped", "passed", "failed" + showStandardStreams true + } +} + +dependencies { + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.mapzen:mapzen-core:0.0.1-SNAPSHOT' + + testCompile 'junit:junit:4.12' + testCompile 'org.assertj:assertj-core:1.7.1' +} + + +apply from: rootProject.file('gradle/gradle-mvn-push.gradle') diff --git a/mapzen-places-api/gradle.properties b/mapzen-places-api/gradle.properties new file mode 100644 index 00000000..22170b3a --- /dev/null +++ b/mapzen-places-api/gradle.properties @@ -0,0 +1,22 @@ +version=0.0.1-SNAPSHOT + +POM_ARTIFACT_ID=mapzen-places-api +POM_NAME=Mapzen Places API +POM_PACKAGING=aar + +GROUP=com.mapzen +VERSION_NAME=0.0.1-SNAPSHOT + +POM_DESCRIPTION=Mapzen Places API. + +POM_URL=https://github.com/mapzen/android +POM_SCM_URL=http://github.com/mapzen/android +POM_SCM_CONNECTION=scm:git:git://github.com/mapzen/android.git +POM_SCM_DEV_CONNECTION=scm:git:git@github.com:mapzen/android.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_ID=Mapzen +POM_DEVELOPER_NAME=Mapzen diff --git a/mapzen-places-api/proguard-rules.pro b/mapzen-places-api/proguard-rules.pro new file mode 100644 index 00000000..fe837ffb --- /dev/null +++ b/mapzen-places-api/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/sarahlensing/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/mapzen-places-api/src/main/AndroidManifest.xml b/mapzen-places-api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..829f2054 --- /dev/null +++ b/mapzen-places-api/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/mapzen-places-api/src/main/res/values/strings.xml b/mapzen-places-api/src/main/res/values/strings.xml new file mode 100644 index 00000000..b4ff593d --- /dev/null +++ b/mapzen-places-api/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + mapzen-places-api + diff --git a/samples/mapzen-android-sdk-sample/.gitignore b/samples/mapzen-android-sdk-sample/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/samples/mapzen-android-sdk-sample/.gitignore @@ -0,0 +1 @@ +/build diff --git a/sample/README.md b/samples/mapzen-android-sdk-sample/README.md similarity index 100% rename from sample/README.md rename to samples/mapzen-android-sdk-sample/README.md diff --git a/sample/build.gradle b/samples/mapzen-android-sdk-sample/build.gradle similarity index 91% rename from sample/build.gradle rename to samples/mapzen-android-sdk-sample/build.gradle index f13238ef..ecc7e375 100644 --- a/sample/build.gradle +++ b/samples/mapzen-android-sdk-sample/build.gradle @@ -8,7 +8,7 @@ android { buildToolsVersion "24.0.3" defaultConfig { - applicationId "com.mapzen.android.sample" + applicationId "com.mapzen.android.sdk.sample" minSdkVersion 15 targetSdkVersion 24 versionCode 1 @@ -41,7 +41,7 @@ task verify(dependsOn: ['test', 'lint']) dependencies { - compile(project(':library')) { + compile(project(':mapzen-android-sdk')) { transitive = true; } compile 'com.android.support:appcompat-v7:24.2.1' diff --git a/sample/proguard-rules.pro b/samples/mapzen-android-sdk-sample/proguard-rules.pro similarity index 100% rename from sample/proguard-rules.pro rename to samples/mapzen-android-sdk-sample/proguard-rules.pro diff --git a/sample/src/main/AndroidManifest.xml b/samples/mapzen-android-sdk-sample/src/main/AndroidManifest.xml similarity index 97% rename from sample/src/main/AndroidManifest.xml rename to samples/mapzen-android-sdk-sample/src/main/AndroidManifest.xml index c6ca254b..e3cd1742 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/samples/mapzen-android-sdk-sample/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/mapzen-places-api-sample/src/main/java/com/mapzen/places/api/sample/MainActivity.java b/samples/mapzen-places-api-sample/src/main/java/com/mapzen/places/api/sample/MainActivity.java new file mode 100644 index 00000000..15bef9a8 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/java/com/mapzen/places/api/sample/MainActivity.java @@ -0,0 +1,12 @@ +package com.mapzen.places.api.sample; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class MainActivity extends AppCompatActivity { + + @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } +} diff --git a/samples/mapzen-places-api-sample/src/main/res/layout/activity_main.xml b/samples/mapzen-places-api-sample/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..57bea024 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/samples/mapzen-places-api-sample/src/main/res/mipmap-hdpi/ic_launcher.png b/samples/mapzen-places-api-sample/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..cde69bcc Binary files /dev/null and b/samples/mapzen-places-api-sample/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/samples/mapzen-places-api-sample/src/main/res/mipmap-mdpi/ic_launcher.png b/samples/mapzen-places-api-sample/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..c133a0cb Binary files /dev/null and b/samples/mapzen-places-api-sample/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/samples/mapzen-places-api-sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/samples/mapzen-places-api-sample/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..bfa42f0e Binary files /dev/null and b/samples/mapzen-places-api-sample/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/samples/mapzen-places-api-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/samples/mapzen-places-api-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..324e72cd Binary files /dev/null and b/samples/mapzen-places-api-sample/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/samples/mapzen-places-api-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/samples/mapzen-places-api-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..aee44e13 Binary files /dev/null and b/samples/mapzen-places-api-sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/samples/mapzen-places-api-sample/src/main/res/values-w820dp/dimens.xml b/samples/mapzen-places-api-sample/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 00000000..308a1947 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/samples/mapzen-places-api-sample/src/main/res/values/colors.xml b/samples/mapzen-places-api-sample/src/main/res/values/colors.xml new file mode 100644 index 00000000..5a077b3a --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/samples/mapzen-places-api-sample/src/main/res/values/dimens.xml b/samples/mapzen-places-api-sample/src/main/res/values/dimens.xml new file mode 100644 index 00000000..acf94cc6 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/samples/mapzen-places-api-sample/src/main/res/values/strings.xml b/samples/mapzen-places-api-sample/src/main/res/values/strings.xml new file mode 100644 index 00000000..274f15b6 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + mapzen-places-api-sample + diff --git a/samples/mapzen-places-api-sample/src/main/res/values/styles.xml b/samples/mapzen-places-api-sample/src/main/res/values/styles.xml new file mode 100644 index 00000000..705be277 --- /dev/null +++ b/samples/mapzen-places-api-sample/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/scripts/deploy-android-sdk-sample-app.sh b/scripts/deploy-android-sdk-sample-app.sh new file mode 100755 index 00000000..d14b995d --- /dev/null +++ b/scripts/deploy-android-sdk-sample-app.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# +# Builds mapzen android sdk sample app and uploads APK to s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/. + +./gradlew assembleDebug -PapiKey=$API_KEY +s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-latest.apk +s3cmd put samples/mapzen-android-sdk-sample/build/outputs/apk/samples_mapzen-android-sdk-sample-debug.apk s3://android.mapzen.com/mapzen-android-sdk-sample-snapshots/mapzen-android-sdk-sample-$CIRCLE_BUILD_NUM.apk diff --git a/scripts/deploy-places-api-sample-app.sh b/scripts/deploy-places-api-sample-app.sh new file mode 100755 index 00000000..1c0cfe4f --- /dev/null +++ b/scripts/deploy-places-api-sample-app.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# +# Builds mapzen places api sample app and uploads APK to s3://android.mapzen.com/mapzen-places-api-sample-snapshots/. + +./gradlew assembleDebug -PapiKey=$API_KEY +s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/mapzen-places-api-sample-latest.apk +s3cmd put samples/mapzen-places-api-sample/build/outputs/apk/samples_mapzen-places-api-sample-debug.apk s3://android.mapzen.com/places-api-sample-snapshots/mapzen-places-api-sample-$CIRCLE_BUILD_NUM.apk diff --git a/scripts/deploy-sample-app.sh b/scripts/deploy-sample-app.sh deleted file mode 100755 index 460a258e..00000000 --- a/scripts/deploy-sample-app.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -# -# Builds sample app and uploads APK to s3://android.mapzen.com/sample-snapshots/. - -./gradlew assembleDebug -PapiKey=$API_KEY -s3cmd put sample/build/outputs/apk/sample-debug.apk s3://android.mapzen.com/mapzen-sample-latest.apk -s3cmd put sample/build/outputs/apk/sample-debug.apk s3://android.mapzen.com/sample-snapshots/mapzen-sample-$CIRCLE_BUILD_NUM.apk diff --git a/settings.gradle b/settings.gradle index 77c36d03..38d48d9b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,10 @@ -include ':library', ':sample' +include ':mapzen-android-sdk' +include ':core' +include ':mapzen-places-api' +include ':samples_mapzen-android-sdk-sample' +include ':samples_mapzen-places-api-sample' + +project(':samples_mapzen-android-sdk-sample').projectDir = + new File('samples/mapzen-android-sdk-sample') +project(':samples_mapzen-places-api-sample').projectDir = + new File('samples/mapzen-places-api-sample') \ No newline at end of file