pheerai
/
rcdbquery
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies

This commit is contained in:
Oliver Rümpelein 2021-10-10 13:32:17 +02:00
parent 8eaa788a41
commit d99ce5131b
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build.gradle.kts
View File

@ -1,15 +1,9 @@
import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript { val pheeraiBomVersion: String by project
extra.apply { val kotlinApiVersion: String by project
set("pheeraiBomVersion", "0.0.6-SNAPSHOT") val javaVersion = JavaVersion.VERSION_11
set("kotlinApiVersion", "1.5")
set("javaVersion", JavaVersion.VERSION_11)
}
}
inline fun <reified T> getFromExtra(prop: String) = project.extra[prop] as T
// TODO: Documentation // TODO: Documentation
// TODO: Source Jar // TODO: Source Jar
@ -38,12 +32,12 @@ repositories {
} }
} }
project.version = "0.0.3-SNAPSHOT" project.version = "0.0.4-SNAPSHOT"
project.group = "de.pheerai.rcdb" project.group = "de.pheerai.rcdb"
java { java {
targetCompatibility = getFromExtra("javaVersion") targetCompatibility = javaVersion
sourceCompatibility = getFromExtra("javaVersion") sourceCompatibility = javaVersion
withSourcesJar() withSourcesJar()
} }
@ -52,7 +46,7 @@ kotlin {
} }
dependencies { dependencies {
implementation(platform("de.pheerai:kotlin-crawler-app-bom:${getFromExtra<String>("pheeraiBomVersion")}")) implementation(platform("de.pheerai:kotlin-crawler-app-bom:$pheeraiBomVersion"))
testImplementation("io.kotest", "kotest-runner-junit5-jvm") testImplementation("io.kotest", "kotest-runner-junit5-jvm")
testImplementation("io.kotest", "kotest-assertions-core-jvm") testImplementation("io.kotest", "kotest-assertions-core-jvm")
@ -61,9 +55,9 @@ dependencies {
tasks { tasks {
withType<KotlinCompile>().configureEach { withType<KotlinCompile>().configureEach {
kotlinOptions { kotlinOptions {
apiVersion = getFromExtra("kotlinApiVersion") apiVersion = kotlinApiVersion
languageVersion = getFromExtra("kotlinApiVersion") languageVersion = kotlinApiVersion
jvmTarget = getFromExtra<JavaVersion>("javaVersion").toString() jvmTarget = javaVersion.toString()
} }
} }

3
gradle.properties
View File

@ -1 +1,4 @@
kotlin.code.style=official kotlin.code.style=official
pheeraiBomVersion=0.0.7-SNAPSHOT
kotlinApiVersion=1.5

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists