From d99ce5131bb7deefe5d38bc951977dc2a5e23bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= <oli_r@fg4f.de>
Date: Sun, 10 Oct 2021 13:32:17 +0200
Subject: [PATCH] Update dependencies

---
 build.gradle.kts                         | 26 +++++++++---------------
 gradle.properties                        |  3 +++
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0e7ca95..d7213da 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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()
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index 7fc6f1f..29b9e42 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,4 @@
 kotlin.code.style=official
+
+pheeraiBomVersion=0.0.7-SNAPSHOT
+kotlinApiVersion=1.5
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a9715..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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