- chg: new icon

- chg: removed duplicities in auto-generated Android icon - chg: changed to Gradle 4.6
asamm · Jun 24, 2018 · 618430d · 618430d
1 parent 4d84641
commit 618430d
Show file tree

Hide file tree

Showing 24 changed files with 12 additions and 226 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.android.application'
 android {
     // defaults
     compileSdkVersion Integer.valueOf(PARAM_COMPILE_SDK_VERSION)
-    buildToolsVersion PARAM_BUILD_TOOLS_VERSION
+    buildToolsVersion ANDROID_BUILD_TOOLS
 
     defaultConfig {
         minSdkVersion Integer.valueOf(PARAM_MIN_SDK_VERSION)
         targetSdkVersion Integer.valueOf(PARAM_TARGET_SDK_VERSION)
 
-        versionCode 14
-        versionName '0.5'
+        versionCode 16
+        versionName '0.7'
     }
 
     // exclude from result
@@ -74,7 +74,7 @@ android {
 
 dependencies {
     // Locus API
-    api 'com.asamm:locus-api-android:' + LIB_LOCUS_API
+    implementation 'com.asamm:locus-api-android:' + LIB_LOCUS_API
 
     // Android support libraries
     implementation 'com.android.support:appcompat-v7:' + LIB_ANDROID_SUPPORT

diff --git a/app/src/main/java/com/asamm/locus/addon/graphhopper/RoutingService.java b/app/src/main/java/com/asamm/locus/addon/graphhopper/RoutingService.java
@@ -297,7 +297,7 @@ private GraphHopper getGraphHooper() {
 	/**
 	 * Set parameters based on properties file.
 	 * @param gh graphHopper instance
-	 * @throws IOException excetion in case of any problems with loading properties file
+	 * @throws IOException exception in case of any problems with loading properties file
 	 */
 	private void setGraphHopperProperties(GraphHopper gh, File routingItem) throws IOException {
 		// set default parameters

diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-nodpi/ic_launcher_xhdpi.png b/app/src/main/res/drawable-nodpi/ic_launcher_xhdpi.png
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:' + BUILD_TOOLS
+        classpath 'com.android.tools.build:gradle:' + ANDROID_PLUGIN_GRADLE
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,15 +2,16 @@
 # BASE
 
 PARAM_COMPILE_SDK_VERSION = 27
-PARAM_BUILD_TOOLS_VERSION = 27.0.3
 PARAM_MIN_SDK_VERSION = 15
 PARAM_TARGET_SDK_VERSION = 27
 
-# https://developer.android.com/studio/releases/build-tools.html
-BUILD_TOOLS = 3.0.1
-
 # LIBRARIES
 
+# https://developer.android.com/studio/releases/gradle-plugin.html
+ANDROID_PLUGIN_GRADLE = 3.0.1
+# https://developer.android.com/studio/releases/build-tools.html
+ANDROID_BUILD_TOOLS = 27.0.3
+
 # base support version
 LIB_ANDROID_SUPPORT = 27.1.1
 # Locus API

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-4.6-all.zip