Skip to content

Commit

Permalink
EPMDJ-2652 Gradle: Got rid of buildSrc
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorbll committed May 20, 2020
1 parent 8665140 commit 8ef41d0
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 45 deletions.
16 changes: 13 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,25 @@ 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")
distribution
`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()
Expand Down Expand Up @@ -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")
Expand Down
24 changes: 0 additions & 24 deletions buildSrc/build.gradle.kts

This file was deleted.

Empty file removed buildSrc/settings.gradle.kts
Empty file.
15 changes: 0 additions & 15 deletions buildSrc/src/main/kotlin/Versions.kt

This file was deleted.

13 changes: 12 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
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
9 changes: 7 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
}

Expand Down

0 comments on commit 8ef41d0

Please sign in to comment.