From 8bf341c46b93f6b9b33d9dc05d5250ba6209da87 Mon Sep 17 00:00:00 2001 From: Sajjad Date: Sun, 17 May 2020 18:11:40 +0430 Subject: [PATCH 1/3] Update build stuff to build with the latest available stable versions --- osrm-text-instructions/build.gradle | 2 +- osrm-text-instructions/dependencies.gradle | 10 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/osrm-text-instructions/build.gradle b/osrm-text-instructions/build.gradle index 316926c..5d2c594 100644 --- a/osrm-text-instructions/build.gradle +++ b/osrm-text-instructions/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.6.3' } } diff --git a/osrm-text-instructions/dependencies.gradle b/osrm-text-instructions/dependencies.gradle index 7f2efd8..1f257d8 100644 --- a/osrm-text-instructions/dependencies.gradle +++ b/osrm-text-instructions/dependencies.gradle @@ -1,11 +1,11 @@ ext { minSdkVersion = 15 - targetSdkVersion = 25 - compileSdkVersion = 25 - buildToolsVersion = "26.0.0" + targetSdkVersion = 29 + compileSdkVersion = 29 + buildToolsVersion = "29.0.3" - versionCode = 2 - versionName = "0.2.0" + versionCode = 3 + versionName = "0.2.1" supportLibVersion = "25.4.0" leakCanaryVersion = '1.5.1' diff --git a/osrm-text-instructions/gradle/wrapper/gradle-wrapper.properties b/osrm-text-instructions/gradle/wrapper/gradle-wrapper.properties index 037dccb..f664254 100644 --- a/osrm-text-instructions/gradle/wrapper/gradle-wrapper.properties +++ b/osrm-text-instructions/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.1-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From 82e51274355d8c63fc18677c4819d3a8a535c6a7 Mon Sep 17 00:00:00 2001 From: Sajjad Date: Tue, 2 Jun 2020 17:57:25 +0430 Subject: [PATCH 2/3] add osrm-instructions library --- osrm-text-instructions/app/build.gradle | 4 ---- .../instructions/testapp/MainActivity.java | 13 +++++++------ .../app/src/main/res/layout/activity_main.xml | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/osrm-text-instructions/app/build.gradle b/osrm-text-instructions/app/build.gradle index 42498c4..7a6f79e 100644 --- a/osrm-text-instructions/app/build.gradle +++ b/osrm-text-instructions/app/build.gradle @@ -27,10 +27,6 @@ dependencies { // Logging compile rootProject.ext.dep.timber - // Butter Knife - compile rootProject.ext.dep.butterKnife - annotationProcessor rootProject.ext.dep.butterKnifeProcessor - // Leak Canary debugCompile rootProject.ext.dep.leakCanaryDebug releaseCompile rootProject.ext.dep.leakCanaryRelease diff --git a/osrm-text-instructions/app/src/main/java/org/project_osrm/instructions/testapp/MainActivity.java b/osrm-text-instructions/app/src/main/java/org/project_osrm/instructions/testapp/MainActivity.java index 2602cb0..fc3344b 100644 --- a/osrm-text-instructions/app/src/main/java/org/project_osrm/instructions/testapp/MainActivity.java +++ b/osrm-text-instructions/app/src/main/java/org/project_osrm/instructions/testapp/MainActivity.java @@ -1,15 +1,16 @@ package org.project_osrm.instructions.testapp; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import androidx.appcompat.app.AppCompatActivity; + import org.project_osrm.instructions.app.R; public class MainActivity extends AppCompatActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - } + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } } diff --git a/osrm-text-instructions/app/src/main/res/layout/activity_main.xml b/osrm-text-instructions/app/src/main/res/layout/activity_main.xml index 65bc710..a68bf70 100644 --- a/osrm-text-instructions/app/src/main/res/layout/activity_main.xml +++ b/osrm-text-instructions/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + From f1d7e02e1ee466ff6758a45198d14b57914459df Mon Sep 17 00:00:00 2001 From: professor_sajjad Date: Mon, 15 Jun 2020 23:16:27 +0430 Subject: [PATCH 3/3] update gradle script and resolve vector drawable issue --- osrm-text-instructions/app/build.gradle | 18 ++++++++++-------- osrm-text-instructions/build.gradle | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/osrm-text-instructions/app/build.gradle b/osrm-text-instructions/app/build.gradle index 7a6f79e..8e88cb4 100644 --- a/osrm-text-instructions/app/build.gradle +++ b/osrm-text-instructions/app/build.gradle @@ -21,20 +21,22 @@ android { dependencies { // Support libraries - compile rootProject.ext.dep.supportAppcompatV7 - compile rootProject.ext.dep.supportConstraintLayout + implementation rootProject.ext.dep.supportAppcompatV7 + implementation rootProject.ext.dep.supportConstraintLayout // Logging - compile rootProject.ext.dep.timber + implementation rootProject.ext.dep.timber // Leak Canary - debugCompile rootProject.ext.dep.leakCanaryDebug - releaseCompile rootProject.ext.dep.leakCanaryRelease - testCompile rootProject.ext.dep.leakCanaryTest + debugImplementation rootProject.ext.dep.leakCanaryDebug + releaseImplementation rootProject.ext.dep.leakCanaryRelease + testImplementation rootProject.ext.dep.leakCanaryTest // Unit Testing - testCompile rootProject.ext.dep.junit - testCompile rootProject.ext.dep.mockito + testImplementation rootProject.ext.dep.junit + testImplementation rootProject.ext.dep.mockito + implementation 'androidx.vectordrawable:vectordrawable:1.2.0-alpha01' + implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0' // Instrumentation testing androidTestCompile(rootProject.ext.dep.testEspressoCore, { diff --git a/osrm-text-instructions/build.gradle b/osrm-text-instructions/build.gradle index 5d2c594..7d53aa8 100644 --- a/osrm-text-instructions/build.gradle +++ b/osrm-text-instructions/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' } }