Removing 'embed' version, united versions file

This commit is contained in:
Andrew Golovashevich 2024-11-05 14:04:18 +03:00
parent 8d04b5d410
commit 1d473e94b9
12 changed files with 48 additions and 59 deletions

2
.gitignore vendored
View File

@ -3,5 +3,5 @@ build/
.gradle/ .gradle/
gradle/ gradle/
/gradlew* /gradlew*
/.kotlin/ .kotlin/
/kotlin-js-store/ /kotlin-js-store/

View File

@ -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()
}
}

View File

@ -1 +0,0 @@
kotlin.code.style=official

View File

@ -1,2 +0,0 @@
rootProject.name = "kotlin-mpp-gradle-build"

View File

@ -1,14 +1,19 @@
import java.util.Properties
plugins { plugins {
kotlin("multiplatform") version "2.0.20" kotlin("multiplatform") version "2.0.20"
`maven-publish` `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" group = "ru.landgrafhomyak.kotlin"
version = "v${readTextFile("../library-version.txt")}k${targetKotlinVersion}" version = "v${versions.getProperty("this")}k${targetKotlinVersion}"
repositories { repositories {
mavenCentral() mavenCentral()

View File

@ -1,3 +1,5 @@
@file:JvmName("Repositories")
package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper
import java.net.URI import java.net.URI

View File

@ -1,10 +1,12 @@
@file:JvmName("Targets")
package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
@OptIn(ExperimentalWasmDsl::class) @OptIn(ExperimentalWasmDsl::class)
public fun KotlinMultiplatformExtension.defineAllTargets() { public fun KotlinMultiplatformExtension.defineAllMultiplatformTargets() {
jvm { jvm {
} }
js(IR) { js(IR) {

View File

@ -1 +0,0 @@
2.0.20

View File

@ -1 +0,0 @@
0.1

View File

@ -1,3 +1,2 @@
includeBuild("impl") includeBuild("impl")
includeBuild("embed")
includeBuild("test") includeBuild("test")

31
test/build.gradle.kts Normal file
View File

@ -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()
}

3
versions.properties Normal file
View File

@ -0,0 +1,3 @@
this=0.1
kotlin=2.0.20
gradle=7.5.1