From 00d93d73b512754a5fe6801c3408ebc5561a2ee6 Mon Sep 17 00:00:00 2001 From: Mohammed Gamal Date: Thu, 1 Aug 2019 21:06:23 +0200 Subject: [PATCH] Migrate to android X and upgrade libraries --- .idea/caches/build_file_checksums.ser | Bin 0 -> 589 bytes .idea/caches/gradle_models.ser | Bin 0 -> 180942 bytes .idea/encodings.xml | 4 ++++ .idea/gradle.xml | 3 +++ .idea/misc.xml | 2 +- app/build.gradle | 12 ++++++------ .../ahmadrosid/drawroutemaps/MapsActivity.java | 2 +- build.gradle | 9 +++++---- drawroutemap/build.gradle | 12 ++++++------ .../lib/drawroutemap/DrawMarker.java | 2 +- .../lib/drawroutemap/RouteDrawerTask.java | 2 +- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 13 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/caches/gradle_models.ser create mode 100644 .idea/encodings.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..9215acac9c4121486b695067813a3a7a31387589 GIT binary patch literal 589 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 literal 0 HcmV?d00001 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