kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Move enums to top level

Browse Source
This commit is contained in:
Alexander Nozik 2020-11-27 21:00:24 +03:00
parent 83ab554955
commit 1b7a2038ed
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt
View File

@ -12,8 +12,6 @@ import ru.mipt.npm.gradle.internal.defaultPlatform
import ru.mipt.npm.gradle.internal.useCommonDependency import ru.mipt.npm.gradle.internal.useCommonDependency
import ru.mipt.npm.gradle.internal.useFx import ru.mipt.npm.gradle.internal.useFx
class KScienceExtension(val project: Project) {
enum class FXModule(val artifact: String, vararg val dependencies: FXModule) { enum class FXModule(val artifact: String, vararg val dependencies: FXModule) {
BASE("javafx-base"), BASE("javafx-base"),
GRAPHICS("javafx-graphics", BASE), GRAPHICS("javafx-graphics", BASE),
@ -41,6 +39,9 @@ class KScienceExtension(val project: Project) {
TEST("test", "Test") TEST("test", "Test")
} }
class KScienceExtension(val project: Project) {
fun useCoroutines( fun useCoroutines(
version: String = KScienceVersions.coroutinesVersion, version: String = KScienceVersions.coroutinesVersion,
sourceSet: DependencySourceSet = DependencySourceSet.MAIN, sourceSet: DependencySourceSet = DependencySourceSet.MAIN,

2
src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt
View File

@ -3,8 +3,6 @@ package ru.mipt.npm.gradle
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.maven import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.repositories import org.gradle.kotlin.dsl.repositories
import ru.mipt.npm.gradle.KScienceExtension.DependencyConfiguration
import ru.mipt.npm.gradle.KScienceExtension.DependencySourceSet
import ru.mipt.npm.gradle.internal.useCommonDependency import ru.mipt.npm.gradle.internal.useCommonDependency
import ru.mipt.npm.gradle.internal.useDependency import ru.mipt.npm.gradle.internal.useDependency

4
src/main/kotlin/ru/mipt/npm/gradle/internal/dependencies.kt
View File

@ -6,8 +6,8 @@ import org.gradle.kotlin.dsl.invoke
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import ru.mipt.npm.gradle.KScienceExtension.DependencyConfiguration import ru.mipt.npm.gradle.DependencyConfiguration
import ru.mipt.npm.gradle.KScienceExtension.DependencySourceSet import ru.mipt.npm.gradle.DependencySourceSet
internal fun Project.useDependency( internal fun Project.useDependency(
vararg pairs: Pair<String, String>, vararg pairs: Pair<String, String>,

4
src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt
View File

@ -6,7 +6,9 @@ import org.gradle.kotlin.dsl.findByType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
import ru.mipt.npm.gradle.KScienceExtension.* import ru.mipt.npm.gradle.DependencyConfiguration
import ru.mipt.npm.gradle.FXModule
import ru.mipt.npm.gradle.FXPlatform
val defaultPlatform: FXPlatform = when { val defaultPlatform: FXPlatform = when {
Os.isFamily(Os.FAMILY_WINDOWS) -> FXPlatform.WINDOWS Os.isFamily(Os.FAMILY_WINDOWS) -> FXPlatform.WINDOWS