File tree Expand file tree Collapse file tree 4 files changed +23
-7
lines changed
src/test/test-fixtures/multi-module Expand file tree Collapse file tree 4 files changed +23
-7
lines changed Original file line number Diff line number Diff line change 12
12
androidGradlePlugin : " com.android.tools.build:gradle:4.1.2" ,
13
13
14
14
// Dependencies
15
- kotlinStdlibJdk7 : " org.jetbrains.kotlin:kotlin-stdlib-jdk7 :${ projectVersion.kotlin} " ,
15
+ kotlinStdlibJdk8 : " org.jetbrains.kotlin:kotlin-stdlib-jdk8 :${ projectVersion.kotlin} " ,
16
16
appCompat : " androidx.appcompat:appcompat:1.2.0" ,
17
17
18
18
// Test dependencies
Original file line number Diff line number Diff line change @@ -85,14 +85,12 @@ test {
85
85
dependencies {
86
86
compileOnly gradleApi()
87
87
implementation projectDependency. androidGradlePlugin
88
- implementation projectDependency. kotlinStdlibJdk7
88
+ implementation projectDependency. kotlinStdlibJdk8
89
89
90
- testImplementation projectDependency. kotlinStdlibJdk7
90
+ testImplementation projectDependency. kotlinStdlibJdk8
91
91
testImplementation projectDependency. kotlinTest
92
92
testImplementation gradleTestKit()
93
93
testImplementation projectDependency. junit
94
94
testImplementation projectDependency. truth
95
95
testImplementation projectDependency. commonsCsv
96
96
}
97
-
98
- // apply from: rootProject.file('publish.gradle')
Original file line number Diff line number Diff line change @@ -30,12 +30,21 @@ android {
30
30
proguardFiles getDefaultProguardFile(' proguard-android.txt' ), ' proguard-rules.pro'
31
31
}
32
32
}
33
+
34
+ compileOptions {
35
+ sourceCompatibility JavaVersion . VERSION_1_8
36
+ targetCompatibility JavaVersion . VERSION_1_8
37
+ }
38
+
39
+ kotlinOptions {
40
+ jvmTarget = " 1.8"
41
+ }
33
42
}
34
43
35
44
dependencies {
36
45
implementation project(" :library_android" )
37
46
38
- implementation projectDependency. kotlinStdlibJdk7
47
+ implementation projectDependency. kotlinStdlibJdk8
39
48
implementation projectDependency. appCompat
40
49
41
50
testImplementation projectDependency. junit
Original file line number Diff line number Diff line change @@ -35,10 +35,19 @@ android {
35
35
proguardFiles getDefaultProguardFile(' proguard-android.txt' ), ' proguard-rules.pro'
36
36
}
37
37
}
38
+
39
+ compileOptions {
40
+ sourceCompatibility JavaVersion . VERSION_1_8
41
+ targetCompatibility JavaVersion . VERSION_1_8
42
+ }
43
+
44
+ kotlinOptions {
45
+ jvmTarget = " 1.8"
46
+ }
38
47
}
39
48
40
49
dependencies {
41
- implementation projectDependency. kotlinStdlibJdk7
50
+ implementation projectDependency. kotlinStdlibJdk8
42
51
implementation projectDependency. appCompat
43
52
44
53
testImplementation projectDependency. junit
You can’t perform that action at this time.
0 commit comments