Update dependencies
This commit is contained in:
parent
8eaa788a41
commit
d99ce5131b
3 changed files with 14 additions and 17 deletions
|
@ -1,15 +1,9 @@
|
|||
import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
buildscript {
|
||||
extra.apply {
|
||||
set("pheeraiBomVersion", "0.0.6-SNAPSHOT")
|
||||
set("kotlinApiVersion", "1.5")
|
||||
set("javaVersion", JavaVersion.VERSION_11)
|
||||
}
|
||||
}
|
||||
|
||||
inline fun <reified T> getFromExtra(prop: String) = project.extra[prop] as T
|
||||
val pheeraiBomVersion: String by project
|
||||
val kotlinApiVersion: String by project
|
||||
val javaVersion = JavaVersion.VERSION_11
|
||||
|
||||
// TODO: Documentation
|
||||
// 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"
|
||||
|
||||
java {
|
||||
targetCompatibility = getFromExtra("javaVersion")
|
||||
sourceCompatibility = getFromExtra("javaVersion")
|
||||
targetCompatibility = javaVersion
|
||||
sourceCompatibility = javaVersion
|
||||
withSourcesJar()
|
||||
}
|
||||
|
||||
|
@ -52,7 +46,7 @@ kotlin {
|
|||
}
|
||||
|
||||
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-assertions-core-jvm")
|
||||
|
@ -61,9 +55,9 @@ dependencies {
|
|||
tasks {
|
||||
withType<KotlinCompile>().configureEach {
|
||||
kotlinOptions {
|
||||
apiVersion = getFromExtra("kotlinApiVersion")
|
||||
languageVersion = getFromExtra("kotlinApiVersion")
|
||||
jvmTarget = getFromExtra<JavaVersion>("javaVersion").toString()
|
||||
apiVersion = kotlinApiVersion
|
||||
languageVersion = kotlinApiVersion
|
||||
jvmTarget = javaVersion.toString()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1,4 @@
|
|||
kotlin.code.style=official
|
||||
|
||||
pheeraiBomVersion=0.0.7-SNAPSHOT
|
||||
kotlinApiVersion=1.5
|
||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
Loading…
Reference in a new issue