Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build stuff to build with the latest available stable versions #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions osrm-text-instructions/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +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

// Butter Knife
compile rootProject.ext.dep.butterKnife
annotationProcessor rootProject.ext.dep.butterKnifeProcessor
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, {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
Expand All @@ -16,4 +16,4 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion osrm-text-instructions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:4.0.0'
}
}

Expand Down
10 changes: 5 additions & 5 deletions osrm-text-instructions/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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