diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..9215aca Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..ebb0a4e Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7157c77..5203c7e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@ - + diff --git a/app/build.gradle b/app/build.gradle index eb5494e..2a1cb7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.ahmadrosid.drawroutemaps" minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -19,10 +19,10 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "com.android.support:appcompat-v7:$support_version" - implementation "com.android.support:support-v4:$support_version" - implementation "com.android.support:animated-vector-drawable:$support_version" - implementation "com.android.support:support-media-compat:$support_version" + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0' + implementation 'androidx.media:media:1.0.1' implementation "com.google.android.gms:play-services-maps:$play_service_version" implementation project(':drawroutemap') } diff --git a/app/src/main/java/com/ahmadrosid/drawroutemaps/MapsActivity.java b/app/src/main/java/com/ahmadrosid/drawroutemaps/MapsActivity.java index 84a6791..f6f396b 100644 --- a/app/src/main/java/com/ahmadrosid/drawroutemaps/MapsActivity.java +++ b/app/src/main/java/com/ahmadrosid/drawroutemaps/MapsActivity.java @@ -2,7 +2,7 @@ import android.graphics.Point; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import com.ahmadrosid.lib.drawroutemap.DrawMarker; import com.ahmadrosid.lib.drawroutemap.DrawRouteMaps; diff --git a/build.gradle b/build.gradle index 893eee6..db7974b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,16 @@ buildscript { - ext.support_version = '27.0.2' - ext.play_service_version = '11.8.0' + ext.support_version = '1.0.0' + ext.play_service_version = '17.0.0' repositories { jcenter() maven { url 'https://maven.google.com/' } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.google.gms:google-services:3.1.1' + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.google.gms:google-services:4.3.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' } } diff --git a/drawroutemap/build.gradle b/drawroutemap/build.gradle index 1e0069c..b201e43 100644 --- a/drawroutemap/build.gradle +++ b/drawroutemap/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 14 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -18,9 +18,9 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:$support_version" - implementation "com.android.support:support-v4:$support_version" - implementation "com.android.support:animated-vector-drawable:$support_version" - implementation "com.android.support:support-media-compat:$support_version" + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0' + implementation 'androidx.media:media:1.0.1' implementation "com.google.android.gms:play-services-maps:$play_service_version" } diff --git a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawMarker.java b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawMarker.java index aa670ee..e493948 100644 --- a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawMarker.java +++ b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/DrawMarker.java @@ -4,7 +4,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.model.BitmapDescriptor; diff --git a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/RouteDrawerTask.java b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/RouteDrawerTask.java index 8495b57..4191e5d 100644 --- a/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/RouteDrawerTask.java +++ b/drawroutemap/src/main/java/com/ahmadrosid/lib/drawroutemap/RouteDrawerTask.java @@ -1,7 +1,7 @@ package com.ahmadrosid.lib.drawroutemap; import android.os.AsyncTask; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.Log; import com.google.android.gms.maps.GoogleMap; diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f386d22..99e5e4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 21 23:23:03 ICT 2018 +#Thu Aug 01 20:46:55 EET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip