diff --git a/app/build.gradle b/app/build.gradle index 287a76b..710b0d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ buildscript { } dependencies { classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' - classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.5' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' + classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6' } } @@ -24,13 +24,11 @@ jacocoAndroidUnitTestReport { } android { - compileSdkVersion 25 - // buildToolsVersion '26.0.2' + compileSdkVersion 27 defaultConfig { applicationId "edu.luc.etl.cs313.android.stopwatch" minSdkVersion 15 - targetSdkVersion 25 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -53,29 +51,27 @@ android { unitTests.includeAndroidResources = true } sourceSets { - sourceSets { - final String sharedTestDir = 'src/main/java/test/android' - test { - java.srcDir sharedTestDir - } - androidTest { - java.srcDir sharedTestDir - } + final String sharedTestDir = 'src/main/java/test/android' + test { + java.srcDir sharedTestDir + } + androidTest { + java.srcDir sharedTestDir } } } dependencies { implementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:25.2.0' + implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'net.sourceforge.streamsupport:streamsupport:1.5.2' // several duplications on account of shared testcase superclass testImplementation 'junit:junit:4.12' - testImplementation 'com.android.support.test:rules:0.5' + testImplementation 'com.android.support.test:rules:1.0.2' testImplementation 'org.robolectric:robolectric:3.5.1' - testImplementation 'com.android.support:appcompat-v7:25.2.0' + testImplementation 'com.android.support:appcompat-v7:27.1.1' androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support:appcompat-v7:25.2.0' - androidTestImplementation 'com.android.support.test:rules:0.5' - androidTestImplementation 'com.android.support.test:runner:0.5' + androidTestImplementation 'com.android.support:appcompat-v7:27.1.1' + androidTestImplementation 'com.android.support.test:rules:1.0.2' + androidTestImplementation 'com.android.support.test:runner:1.0.2' }