File tree Expand file tree Collapse file tree 5 files changed +5
-26
lines changed Expand file tree Collapse file tree 5 files changed +5
-26
lines changed Original file line number Diff line number Diff line change
1
+ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2
+
1
3
plugins {
2
4
id " com.automattic.android.fetchstyle"
3
5
id " io.gitlab.arturbosch.detekt"
@@ -103,9 +105,9 @@ allprojects {
103
105
debug = false
104
106
}
105
107
106
- tasks. withType(org.jetbrains.kotlin.gradle.tasks. KotlinCompile ). all {
108
+ tasks. withType(KotlinCompile ). all {
107
109
kotlinOptions {
108
- jvmTarget = " 1.8 "
110
+ jvmTarget = JavaVersion . VERSION_1_8
109
111
}
110
112
}
111
113
}
Original file line number Diff line number Diff line change @@ -2,19 +2,8 @@ plugins {
2
2
id " org.jetbrains.kotlin.jvm"
3
3
}
4
4
5
- sourceCompatibility = " 7"
6
- targetCompatibility = " 7"
7
-
8
- repositories {
9
- mavenCentral()
10
- }
11
5
compileKotlin {
12
6
kotlinOptions {
13
- jvmTarget = " 1.8"
14
- }
15
- }
16
- compileTestKotlin {
17
- kotlinOptions {
18
- jvmTarget = " 1.8"
7
+ allWarningsAsErrors = true
19
8
}
20
9
}
Original file line number Diff line number Diff line change @@ -41,10 +41,6 @@ android {
41
41
minSdkVersion rootProject. minSdkVersion
42
42
targetSdkVersion rootProject. targetSdkVersion
43
43
}
44
- compileOptions {
45
- sourceCompatibility 1.8
46
- targetCompatibility 1.8
47
- }
48
44
49
45
// Avoid 'duplicate files during packaging of APK' errors
50
46
packagingOptions {
Original file line number Diff line number Diff line change @@ -18,10 +18,6 @@ android {
18
18
vectorDrawables. useSupportLibrary = true
19
19
}
20
20
21
- kotlinOptions {
22
- jvmTarget = JavaVersion . VERSION_1_8
23
- }
24
-
25
21
sourceSets {
26
22
main. java. srcDirs + = ' src/main/kotlin'
27
23
test. java. srcDirs + = ' src/test/kotlin'
Original file line number Diff line number Diff line change @@ -17,7 +17,3 @@ dependencies {
17
17
testImplementation " com.nhaarman.mockitokotlin2:mockito-kotlin:$nhaarmanMockitoVersion "
18
18
testImplementation " org.assertj:assertj-core:$assertJVersion "
19
19
}
20
-
21
- sourceCompatibility = " 7"
22
- targetCompatibility = " 7"
23
-
You can’t perform that action at this time.
0 commit comments