From 1d473e94b9a5722a52f11aa91d06a9b8cbc128d5 Mon Sep 17 00:00:00 2001
From: Andrew Golovashevich <landgrafhomyak@gmail.com>
Date: Tue, 5 Nov 2024 14:04:18 +0300
Subject: [PATCH] Removing 'embed' version, united versions file

---
 .gitignore                                    |  2 +-
 embed/build.gradle.kts                        | 48 -------------------
 embed/gradle.properties                       |  1 -
 embed/settings.gradle.kts                     |  2 -
 impl/build.gradle.kts                         | 11 +++--
 .../kotlin/kmp_gradle_build_helper/repos.kt   |  2 +
 .../kotlin/kmp_gradle_build_helper/targets.kt |  4 +-
 kotlin-version.txt                            |  1 -
 library-version.txt                           |  1 -
 settings.gradle.kts                           |  1 -
 test/build.gradle.kts                         | 31 ++++++++++++
 versions.properties                           |  3 ++
 12 files changed, 48 insertions(+), 59 deletions(-)
 delete mode 100644 embed/build.gradle.kts
 delete mode 100644 embed/gradle.properties
 delete mode 100644 embed/settings.gradle.kts
 delete mode 100644 kotlin-version.txt
 delete mode 100644 library-version.txt
 create mode 100644 test/build.gradle.kts
 create mode 100644 versions.properties

diff --git a/.gitignore b/.gitignore
index 31ce9c3..ca2a97d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ build/
 .gradle/
 gradle/
 /gradlew*
-/.kotlin/
+.kotlin/
 /kotlin-js-store/
\ No newline at end of file
diff --git a/embed/build.gradle.kts b/embed/build.gradle.kts
deleted file mode 100644
index cc3d4a5..0000000
--- a/embed/build.gradle.kts
+++ /dev/null
@@ -1,48 +0,0 @@
-import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.defineXomrkGiteaMavenRepo
-
-buildscript {
-	fun readTextFile(relPath: String) = rootDir.resolve(relPath).readText().trim()
-
-
-	dependencies {
-		classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build-helper:v${readTextFile("../library-version.txt")}k${readTextFile("../kotlin-version.txt")}")
-	}
-}
-
-plugins {
-	kotlin("multiplatform") version "2.0.20"
-	`maven-publish`
-}
-
-fun readTextFile(relPath: String) = rootDir.resolve(relPath).readText().trim()
-
-val targetKotlinVersion = readTextFile("../kotlin-version.txt")
-
-group = "ru.landgrafhomyak.kotlin"
-version = "v${readTextFile("../library-version.txt")}k${targetKotlinVersion}"
-
-repositories {
-	mavenCentral()
-}
-
-
-
-kotlin {
-	jvmToolchain(8)
-	jvm()
-
-	sourceSets {
-		jvmMain {
-			dependencies {
-				implementation("${group}:kotlin-mpp-gradle-build-helper:${targetKotlinVersion}")
-				implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${targetKotlinVersion}")
-			}
-		}
-	}
-}
-
-publishing {
-	repositories {
-		defineXomrkGiteaMavenRepo()
-	}
-}
\ No newline at end of file
diff --git a/embed/gradle.properties b/embed/gradle.properties
deleted file mode 100644
index 29e08e8..0000000
--- a/embed/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-kotlin.code.style=official
\ No newline at end of file
diff --git a/embed/settings.gradle.kts b/embed/settings.gradle.kts
deleted file mode 100644
index af3c3cd..0000000
--- a/embed/settings.gradle.kts
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = "kotlin-mpp-gradle-build"
-
diff --git a/impl/build.gradle.kts b/impl/build.gradle.kts
index fb68c2e..f25242c 100644
--- a/impl/build.gradle.kts
+++ b/impl/build.gradle.kts
@@ -1,14 +1,19 @@
+import java.util.Properties
+
 plugins {
 	kotlin("multiplatform") version "2.0.20"
 	`maven-publish`
 }
 
-fun readTextFile(relPath:String) = rootDir.resolve(relPath).readText().trim()
 
-val targetKotlinVersion = readTextFile("../kotlin-version.txt")
+
+val versions = Properties()
+versions.load(rootDir.resolve("../versions.properties").inputStream())
+
+val targetKotlinVersion = versions.getProperty("kotlin")
 
 group = "ru.landgrafhomyak.kotlin"
-version = "v${readTextFile("../library-version.txt")}k${targetKotlinVersion}"
+version = "v${versions.getProperty("this")}k${targetKotlinVersion}"
 
 repositories {
 	mavenCentral()
diff --git a/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/repos.kt b/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/repos.kt
index 03668a3..635d8f9 100644
--- a/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/repos.kt
+++ b/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/repos.kt
@@ -1,3 +1,5 @@
+@file:JvmName("Repositories")
+
 package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper
 
 import java.net.URI
diff --git a/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/targets.kt b/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/targets.kt
index 6795e49..efc309d 100644
--- a/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/targets.kt
+++ b/impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/targets.kt
@@ -1,10 +1,12 @@
+@file:JvmName("Targets")
+
 package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper
 
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 @OptIn(ExperimentalWasmDsl::class)
-public fun KotlinMultiplatformExtension.defineAllTargets() {
+public fun KotlinMultiplatformExtension.defineAllMultiplatformTargets() {
 	jvm {
 	}
 	js(IR) {
diff --git a/kotlin-version.txt b/kotlin-version.txt
deleted file mode 100644
index a30e84f..0000000
--- a/kotlin-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.0.20
\ No newline at end of file
diff --git a/library-version.txt b/library-version.txt
deleted file mode 100644
index ceab6e1..0000000
--- a/library-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d1836cc..46b9596 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,2 @@
 includeBuild("impl")
-includeBuild("embed")
 includeBuild("test")
\ No newline at end of file
diff --git a/test/build.gradle.kts b/test/build.gradle.kts
new file mode 100644
index 0000000..1315591
--- /dev/null
+++ b/test/build.gradle.kts
@@ -0,0 +1,31 @@
+import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.defineAllMultiplatformTargets
+import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.defineXomrkGiteaMavenRepo
+
+buildscript {
+	val versions = java.util.Properties()
+	versions.load(rootDir.resolve("../versions.properties").inputStream())
+
+
+	repositories {
+		mavenCentral()
+	}
+
+	dependencies {
+		classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build-helper:v${versions.getProperty("this")}k${versions.getProperty("kotlin")}")
+	}
+}
+
+plugins {
+	kotlin("multiplatform") version "2.0.20"
+}
+
+repositories {
+	mavenCentral()
+	defineXomrkGiteaMavenRepo()
+}
+
+
+kotlin {
+	jvmToolchain(8)
+	defineAllMultiplatformTargets()
+}
diff --git a/versions.properties b/versions.properties
new file mode 100644
index 0000000..7152cd5
--- /dev/null
+++ b/versions.properties
@@ -0,0 +1,3 @@
+this=0.1
+kotlin=2.0.20
+gradle=7.5.1
\ No newline at end of file