Use Kotlin DSL for Duktape stub gradle file

- Update to Java 8
- Move stub to common.gradle
This commit is contained in:
arkon 2020-06-26 09:07:50 -04:00
parent 33f763e157
commit 3bd98888ee
9 changed files with 17 additions and 31 deletions

View File

@ -76,6 +76,7 @@ dependencies {
compileOnly 'org.jsoup:jsoup:1.10.2'
compileOnly 'com.google.code.gson:gson:2.8.2'
compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'
compileOnly project(':duktape-stub')
}
preBuild.dependsOn(lintKotlin)

View File

@ -1,13 +0,0 @@
apply plugin: 'java'
sourceSets {
main {
java.srcDirs = ['src']
}
}
dependencies {
}
sourceCompatibility = "1.6"
targetCompatibility = "1.6"

View File

@ -0,0 +1,16 @@
plugins {
java
}
sourceSets {
main {
java {
srcDirs(listOf("src"))
}
}
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

View File

@ -13,7 +13,6 @@ ext {
dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-protobuf:0.20.0'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0'
compileOnly project(':duktape-stub')
}
apply from: "$rootDir/common.gradle"

View File

@ -9,8 +9,4 @@ ext {
libVersion = '1.2'
}
dependencies {
compileOnly project(':duktape-stub')
}
apply from: "$rootDir/common.gradle"

View File

@ -9,8 +9,4 @@ ext {
libVersion = '1.2'
}
dependencies {
compileOnly project(':duktape-stub')
}
apply from: "$rootDir/common.gradle"

View File

@ -11,7 +11,6 @@ ext {
dependencies {
implementation project(':lib-ratelimit')
compileOnly project(':duktape-stub')
compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
compileOnly "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
}

View File

@ -9,8 +9,4 @@ ext {
libVersion = '1.2'
}
dependencies {
compileOnly project(':duktape-stub')
}
apply from: "$rootDir/common.gradle"

View File

@ -9,8 +9,4 @@ ext {
libVersion = '1.2'
}
dependencies {
compileOnly project(':duktape-stub')
}
apply from: "$rootDir/common.gradle"