milan jurkulák преди 2 години
родител
ревизия
7a37337614

+ 11 - 1
build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.mjdev.gradle.extensions.ProjectExt.createTask
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -78,6 +77,17 @@ allprojects {
     }
 }
 
+fun Project.createTask(
+    name: String,
+    group: String = "mjdev",
+    description: String = "",
+    configureAction: Task.() -> Unit
+) = tasks.create(name).apply {
+    this.group = group
+    this.description = description
+    configureAction.invoke(this)
+}
+
 compose {
     desktop {
         application {

+ 0 - 17
buildSrc/build.gradle.kts

@@ -1,17 +0,0 @@
-repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
-}
-
-plugins {
-    `kotlin-dsl`
-}
-
-dependencies {
-    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
-    implementation(gradleApi())
-    implementation(gradleKotlinDsl())
-    implementation(libs.gradle)
-    implementation(libs.gradle.api)
-}

+ 0 - 7
buildSrc/settings.gradle.kts

@@ -1,7 +0,0 @@
-dependencyResolutionManagement {
-    versionCatalogs {
-        create("libs") {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}

+ 0 - 70
buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/DependencyExt.kt

@@ -1,70 +0,0 @@
-package org.mjdev.gradle.extensions
-
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.MinimalExternalModuleDependency
-import org.gradle.api.internal.catalog.ExternalModuleDependencyFactory
-import org.gradle.api.provider.Provider
-import org.gradle.kotlin.dsl.DependencyHandlerScope
-
-object DependencyExt {
-    private const val IMPLEMENTATION = "implementation"
-    private const val DEBUG_IMPLEMENTATION = "debugImplementation"
-    private const val ANDROID_TEST_IMPLEMENTATION = "androidTestImplementation"
-    private const val TEST_IMPLEMENTATION = "testImplementation"
-    private const val KAPT_IMPLEMENTATION = "kapt"
-    private const val KSP_IMPLEMENTATION = "ksp"
-
-    fun DependencyHandlerScope.implementation(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(IMPLEMENTATION, dependency.get())
-    }
-
-    fun DependencyHandlerScope.implementation(
-        dependency: ExternalModuleDependencyFactory.DependencyNotationSupplier
-    ) {
-        add(IMPLEMENTATION, dependency.asProvider().get())
-    }
-
-    fun DependencyHandlerScope.implementation(
-        dependency: Dependency
-    ) {
-        add(IMPLEMENTATION, dependency)
-    }
-
-    fun DependencyHandlerScope.implementation(
-        dependency: String
-    ) {
-        add(IMPLEMENTATION, dependency)
-    }
-
-    fun DependencyHandlerScope.debugImplementation(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(DEBUG_IMPLEMENTATION, dependency.get())
-    }
-
-    fun DependencyHandlerScope.androidTestImplementation(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(ANDROID_TEST_IMPLEMENTATION, dependency.get())
-    }
-
-    fun DependencyHandlerScope.testImplementation(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(TEST_IMPLEMENTATION, dependency.get())
-    }
-
-    fun DependencyHandlerScope.ksp(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(KSP_IMPLEMENTATION, dependency.get())
-    }
-
-    fun DependencyHandlerScope.kapt(
-        dependency: Provider<MinimalExternalModuleDependency>
-    ) {
-        add(KAPT_IMPLEMENTATION, dependency.get())
-    }
-}

+ 0 - 46
buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/ProjectExt.kt

@@ -1,46 +0,0 @@
-package org.mjdev.gradle.extensions
-
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.kotlin.dsl.extra
-import java.lang.Boolean.parseBoolean
-
-@Suppress("HasPlatformType", "unused", "MemberVisibilityCanBePrivate")
-object ProjectExt {
-
-    val Project.androidStudioVersion
-        get() = project.extra.properties["android.studio.version"]
-
-    val Project.runningFromAndroidStudio
-        get() = parseBoolean(project.extra.properties["android.injected.invoked.from.ide"].toString())
-
-    val Project.isAndroidStudio
-        get() = project.extra.properties.keys.contains("android.studio.version")
-
-//    val Project.libs
-//        get() = the<LibrariesForLibs>()
-
-//    fun Project.apply(plugin: Provider<*>) =
-//        project.plugins.apply(plugin.get().toString())
-
-//    fun Project.apply(plugin: String) =
-//        project.plugins.apply(plugin)
-
-//    fun <T : Task> Project.createTask(name: String, configureAction: T.() -> Unit) = tasks.create(name).apply {
-//        configureAction.invoke(this as T)
-//    }
-
-    fun Project.createTask(
-        name: String,
-        group: String = "mjdev",
-        description: String = "",
-        configureAction: Task.() -> Unit
-    ) = tasks.create(name).apply {
-        this.group = group
-        this.description = description
-        configureAction.invoke(this)
-    }
-
-//    inline fun <reified T : Plugin<Project>> Project.apply() =
-//        project.plugins.apply(T::class.java)
-}