From 25a8dc20bcacb4ec588a2e46dbf4d3e4174559a8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 5 Oct 2018 22:08:10 +0200 Subject: [PATCH] updating gradle, kotlin, commons --- app/build.gradle | 20 +++++++++---------- .../calculator/MainActivityTest.java | 16 +++++++-------- build.gradle | 8 ++++---- gradle.properties | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 80de9fd..01cf73b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,18 +3,18 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.simplemobiletools.calculator" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 21 versionName "4.1.0" setProperty("archivesBaseName", "calculator") - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } signingConfigs { @@ -43,16 +43,16 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:4.6.4' + implementation 'com.simplemobiletools:commons:4.9.1' implementation 'me.grantland:autofittextview:0.2.1' testImplementation 'junit:junit:4.12' - testImplementation 'org.robolectric:robolectric:3.5.1' + testImplementation 'org.robolectric:robolectric:3.8' - androidTestImplementation 'com.android.support:support-annotations:27.1.1' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.annotation:annotation:1.0.0' + androidTestImplementation 'androidx.test:runner:1.1.0-beta01' + androidTestImplementation 'androidx.test:rules:1.1.0-beta01' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta01' } Properties props = new Properties() diff --git a/app/src/androidTest/java/com/simplemobiletools/calculator/MainActivityTest.java b/app/src/androidTest/java/com/simplemobiletools/calculator/MainActivityTest.java index d6c2e04..c64bd65 100644 --- a/app/src/androidTest/java/com/simplemobiletools/calculator/MainActivityTest.java +++ b/app/src/androidTest/java/com/simplemobiletools/calculator/MainActivityTest.java @@ -1,7 +1,7 @@ package com.simplemobiletools.calculator; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import com.simplemobiletools.calculator.activities.MainActivity; @@ -9,12 +9,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.longClick; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.longClick; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; @RunWith(AndroidJUnit4.class) public class MainActivityTest { diff --git a/build.gradle b/build.gradle index b7a3323..5aab4c3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.60' + ext.kotlin_version = '1.2.71' repositories { - jcenter() google() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -19,8 +19,8 @@ buildscript { allprojects { repositories { - jcenter() google() + jcenter() maven { url "https://jitpack.io" } } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ecd43e7..7ec95d7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 29 21:23:30 CET 2017 +#Wed Sep 26 23:34:53 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip