From 8ef41d0ac92c4c2c02cf48ef59aa64e822b10c42 Mon Sep 17 00:00:00 2001
From: Viktor Bellavin <viktor_bellavin@epam.com>
Date: Thu, 21 May 2020 00:39:11 +0300
Subject: [PATCH] EPMDJ-2652 Gradle: Got rid of buildSrc

---
 build.gradle.kts                     | 16 +++++++++++++---
 buildSrc/build.gradle.kts            | 24 ------------------------
 buildSrc/settings.gradle.kts         |  0
 buildSrc/src/main/kotlin/Versions.kt | 15 ---------------
 gradle.properties                    | 13 ++++++++++++-
 settings.gradle.kts                  |  9 +++++++--
 6 files changed, 32 insertions(+), 45 deletions(-)
 delete mode 100644 buildSrc/build.gradle.kts
 delete mode 100644 buildSrc/settings.gradle.kts
 delete mode 100644 buildSrc/src/main/kotlin/Versions.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 325cef30..9d2b3ae7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,8 +6,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.target.*
 
 plugins {
-    id("kotlin-multiplatform")
-    id("kotlinx-serialization")
+    kotlin("multiplatform")
+    kotlin("plugin.serialization")
     id("com.epam.drill.cross-compilation")
     id("com.epam.drill.version.plugin")
     id("com.github.johnrengelman.shadow")
@@ -15,6 +15,16 @@ plugins {
     `maven-publish`
 }
 
+val serializationRuntimeVersion = "0.20.0"
+val coroutinesVersion = "1.3.5"
+val uuidVersion = "0.1.0"
+
+val drillJvmApiLibVersion: String by extra
+val drillApiVersion: String by extra
+val drillAgentCoreVersion: String by extra
+val drillTransportLibVersion: String by extra
+val drillLogger: String by extra
+
 allprojects {
     repositories {
         mavenLocal()
@@ -66,7 +76,7 @@ kotlin {
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf-native:$serializationRuntimeVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-properties-native:$serializationRuntimeVersion")
                     implementation("com.epam.drill:jvmapi-native:$drillJvmApiLibVersion")
-                    implementation("com.epam.drill.transport:core:$drillTransportLibVerison")
+                    implementation("com.epam.drill.transport:core:$drillTransportLibVersion")
                     implementation("com.benasher44:uuid:$uuidVersion")
                     implementation("com.epam.drill:drill-agent-part:$drillApiVersion")
                     implementation("com.epam.drill:common:$drillApiVersion")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index ef318d7b..00000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,24 +0,0 @@
-plugins {
-    `kotlin-dsl`
-}
-
-repositories {
-    mavenLocal()
-    maven(url = "https://dl.bintray.com/kotlin/kotlinx/")
-    maven(url = "http://oss.jfrog.org/oss-release-local")
-    jcenter()
-}
-
-val kotlinVersion = "1.3.72"
-val drillPluginVersion = "0.16.1"
-dependencies {
-    implementation(kotlin("gradle-plugin", kotlinVersion))
-    implementation(kotlin("stdlib-jdk8", kotlinVersion))
-    implementation(kotlin("serialization", kotlinVersion))
-    implementation(kotlin("reflect", kotlinVersion))
-    implementation("com.epam.drill:gradle-plugin:$drillPluginVersion")
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
deleted file mode 100644
index e69de29b..00000000
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
deleted file mode 100644
index 912b3b0e..00000000
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-val serializationRuntimeVersion = "0.20.0"
-
-val coroutinesVersion = "1.3.5"
-
-val drillJvmApiLibVersion = "0.4.1"
-
-val drillApiVersion = "0.5.0"
-
-val drillAgentCoreVersion = "0.5.0-52"
-
-val drillLogger = "0.1.3"
-
-val drillTransportLibVerison = "0.2.5"
-
-val uuidVersion = "0.1.0"
diff --git a/gradle.properties b/gradle.properties
index 4d7ae345..43932e4d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,17 @@
 group=com.epam.drill
+
 kotlin.native.ignoreDisabledTargets=true
 org.gradle.parallel=true
 kotlin.code.style=official
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=4048m
\ No newline at end of file
+org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=4048m
+
+# Versions of dependencies
+kotlinVersion=1.3.72
+
+drillApiVersion=0.5.0
+drillAgentCoreVersion=0.5.0
+drillJvmApiLibVersion=0.4.1
+drillTransportLibVersion=0.2.5
+drillLogger=0.1.3
+drillGradlePluginVersion=0.16.2
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6ffa5df2..b8bf5299 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,14 +1,19 @@
 rootProject.name = "java-agent"
 
 pluginManagement {
+    val kotlinVersion: String by extra
+    val drillGradlePluginVersion: String by extra
     plugins {
+        kotlin("multiplatform") version kotlinVersion
+        kotlin("plugin.serialization") version kotlinVersion
+        id("com.epam.drill.cross-compilation") version drillGradlePluginVersion
+        id("com.epam.drill.version.plugin") version drillGradlePluginVersion
         id("com.epam.drill.agent.runner.app") version "0.1.2"
         id("com.github.johnrengelman.shadow") version "5.2.0"
     }
     repositories {
-        maven(url = "http://oss.jfrog.org/oss-release-local")
         gradlePluginPortal()
-        jcenter()
+        maven(url = "http://oss.jfrog.org/oss-release-local")
     }
 }