Skip to content

Commit a9ae8fe

Browse files
Igor Ganapolskymannodermaus
authored andcommitted
Update versions and configuration. (#20)
Upgrade to proper gradle-4.2. Use updated build tools. Get rid of deprecated sourceCompatibility and targetCompatibility.
1 parent 8964b59 commit a9ae8fe

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

android-junit5-embedded-runtime/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ apply plugin: "maven-publish"
1313
apply plugin: "com.github.johnrengelman.shadow"
1414
apply plugin: "com.jfrog.bintray"
1515

16-
sourceCompatibility = JavaVersion.VERSION_1_6
17-
targetCompatibility = JavaVersion.VERSION_1_6
18-
1916
// ------------------------------------------------------------------------------------------------
2017
// Dependency Definitions
2118
// This module exports a "fat JAR" containing embedded JARs from IntelliJ IDEA,

android-junit5/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ apply plugin: "maven"
44
apply plugin: "maven-publish"
55
apply plugin: "com.jfrog.bintray"
66

7-
sourceCompatibility = JavaVersion.VERSION_1_6
8-
targetCompatibility = JavaVersion.VERSION_1_6
9-
107
// ------------------------------------------------------------------------------------------------
118
// Test Setup
129
//
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
distributionBase = GRADLE_USER_HOME
2-
distributionPath = wrapper/dists
3-
zipStoreBase = GRADLE_USER_HOME
4-
zipStorePath = wrapper/dists
5-
distributionUrl = https\://services.gradle.org/distributions/gradle-4.2-bin.zip
1+
#Mon Oct 09 16:59:22 EDT 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip

sample/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = "1.1.50"
2+
ext.kotlinVersion = "1.1.51"
33

44
repositories {
55
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
@@ -39,13 +39,13 @@ android {
3939
versionName "1.0"
4040
}
4141

42-
compileOptions {
43-
targetCompatibility JavaVersion.VERSION_1_8
44-
sourceCompatibility JavaVersion.VERSION_1_8
45-
}
46-
4742
sourceSets {
48-
test.java.srcDirs += "src/test/kotlin"
43+
test.java.srcDirs += "src/test/kotlin"
44+
}
45+
46+
compileOptions {
47+
targetCompatibility 1.8
48+
sourceCompatibility 1.8
4949
}
5050
}
5151

0 commit comments

Comments
 (0)