xomrk/kotlin-mpp-gradle-build-helper
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Compare commits

base: xomrk:master/k2.0.x
Branches Tags
xomrk:master/k2.0.x
xomrk:master/k2.1.x
xomrk:v0.2k2.0.20
xomrk:v0.1k2.0.20
..
compare: xomrk:v0.2k2.0.20
Branches Tags
xomrk:master/k2.1.x
xomrk:master/k2.0.x
xomrk:v0.2k2.0.20
xomrk:v0.1k2.0.20

No commits in common. "master/k2.0.x" and "v0.2k2.0.20" have entirely different histories.
master/k2. ... v0.2k2.0.2

3 changed files with 13 additions and 63 deletions
Show Stats Expand all files Collapse all files

52
impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/compilations.kt
View File

@ -6,65 +6,37 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
public fun KotlinMultiplatformExtension.configureAllCompilationsOnAllTargets(action: KotlinCompilation<*>.() -> Unit) { public fun KotlinMultiplatformExtension.configureAllCompilations(action: KotlinCompilation<*>.() -> Unit) {
this.targets.configureEach { t -> this.targets.configureEach { t ->
t.compilations.configureEach(action) t.compilations.configureEach(action)
} }
} }
@Deprecated( public fun KotlinMultiplatformExtension.configureAllCompilersOptions(action: KotlinCommonCompilerOptions.() -> Unit) {
message = "New name avoids confusions when function called on wrong scope",
replaceWith = ReplaceWith(
"this.configureAllCompilationsOnAllTargets",
"ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.configureAllCompilationsOnAllTargets"
)
)
public fun KotlinMultiplatformExtension.configureAllCompilations(action: KotlinCompilation<*>.() -> Unit): Unit =
this.configureAllCompilationsOnAllTargets(action)
public fun KotlinMultiplatformExtension.configureAllCompilersOptionsOnAllTargets(action: KotlinCommonCompilerOptions.() -> Unit) {
this.targets.configureEach { t -> this.targets.configureEach { t ->
t.configureAllCompilersOptionsOnAllCompilations(action) t.compilations.configureEach { c ->
} c.compileTaskProvider.configure { t ->
} t.compilerOptions(action)
}
@Deprecated(
message = "New name avoids confusions when function called on wrong scope",
replaceWith = ReplaceWith(
"this.configureAllCompilersOptionsOnAllTargets",
"ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.configureAllCompilersOptionsOnAllTargets"
)
)
public fun KotlinMultiplatformExtension.configureAllCompilersOptions(action: KotlinCommonCompilerOptions.() -> Unit): Unit =
this.configureAllCompilersOptionsOnAllTargets(action)
public fun KotlinTarget.configureAllCompilersOptionsOnAllCompilations(action: KotlinCommonCompilerOptions.() -> Unit) {
this.compilations.configureEach { c ->
c.compileTaskProvider.configure { t ->
t.compilerOptions(action)
} }
} }
} }
public fun KotlinMultiplatformExtension.noWarnExpectActual(): Unit = public fun KotlinMultiplatformExtension.noWarnExpectActual(): Unit =
this.configureAllCompilersOptionsOnAllTargets { this@configureAllCompilersOptionsOnAllTargets.freeCompilerArgs.add("-Xexpect-actual-classes") } this.configureAllCompilersOptions { this@configureAllCompilersOptions.freeCompilerArgs.add("-Xexpect-actual-classes") }
public fun KotlinMultiplatformExtension.warningsAsErrors(): Unit = public fun KotlinMultiplatformExtension.warningsAsErrors(): Unit =
this.configureAllCompilersOptionsOnAllTargets { this@configureAllCompilersOptionsOnAllTargets.allWarningsAsErrors.set(true) } this.configureAllCompilersOptions { this@configureAllCompilersOptions.allWarningsAsErrors.set(true) }
public fun KotlinMultiplatformExtension.optIn(classQualname: String): Unit = public fun KotlinMultiplatformExtension.optIn(classQualname: String): Unit =
this.configureAllCompilersOptionsOnAllTargets { this@configureAllCompilersOptionsOnAllTargets.optIn.add(classQualname) } this.configureAllCompilersOptions { this@configureAllCompilersOptions.optIn.add(classQualname) }
public fun KotlinMultiplatformExtension.optInContracts(): Unit = public fun KotlinMultiplatformExtension.optInContracts(): Unit =
this.optIn("kotlin.contracts.ExperimentalContracts") this.optIn("kotlin.contracts.ExperimentalContracts")
public fun KotlinMultiplatformExtension.optInUnsignedArrayTypes(): Unit =
this.optIn("kotlin.ExperimentalUnsignedTypes")
public fun KotlinMultiplatformExtension.setCompatibilityWithKotlin(version: KotlinVersion): Unit = public fun KotlinMultiplatformExtension.setCompatibilityWithKotlin(version: KotlinVersion): Unit =
this.configureAllCompilersOptionsOnAllTargets { this.configureAllCompilersOptions {
this@configureAllCompilersOptionsOnAllTargets.apiVersion.set(version) this@configureAllCompilersOptions.apiVersion.set(version)
this@configureAllCompilersOptionsOnAllTargets.languageVersion.set(version) this@configureAllCompilersOptions.languageVersion.set(version)
} }

22
impl/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/improvements.kt
View File

@ -1,22 +0,0 @@
package ru.landgrafhomyak.kotlin.kmp_gradle_build_helper
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
public enum class Improvements {
JAVA_INTERFACES_DEFAULT_METHODS {
// since kotlin 1.4
override fun fix(target: KotlinMultiplatformExtension) {
target.configureAllCompilersOptions { freeCompilerArgs.add("-Xjvm-default=all") }
}
};
internal abstract fun fix(target: KotlinMultiplatformExtension)
}
public fun KotlinMultiplatformExtension.fixAllStrangeBehavioursExcept(vararg except: Improvements) {
(Improvements.values().toSet() - except.toSet()).forEach { f -> f.fix(this) }
}
public fun KotlinMultiplatformExtension.fixAllStrangeBehaviours(): Unit = this.fixAllStrangeBehavioursExcept()

2
versions.properties
View File

@ -1,3 +1,3 @@
this=0.3 this=0.2
kotlin=2.0.20 kotlin=2.0.20
gradle=7.5.1 gradle=7.5.1