Build: move buildscripts & versions from root directory to ./gradle
javaInstrumentation.gradle.kts report.gradle.kts versions.gradle.kts and all versions.properties
This commit is contained in:
+3
-3
@@ -142,9 +142,9 @@ fun checkJDK() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
rootProject.apply {
|
rootProject.apply {
|
||||||
from(rootProject.file("versions.gradle.kts"))
|
from(rootProject.file("gradle/versions.gradle.kts"))
|
||||||
from(rootProject.file("report.gradle.kts"))
|
from(rootProject.file("gradle/report.gradle.kts"))
|
||||||
from(rootProject.file("javaInstrumentation.gradle.kts"))
|
from(rootProject.file("gradle/javaInstrumentation.gradle.kts"))
|
||||||
}
|
}
|
||||||
|
|
||||||
IdeVersionConfigurator.setCurrentIde(this)
|
IdeVersionConfigurator.setCurrentIde(this)
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
rootProject.apply {
|
rootProject.apply {
|
||||||
from(rootProject.file("../versions.gradle.kts"))
|
from(rootProject.file("../gradle/versions.gradle.kts"))
|
||||||
}
|
}
|
||||||
|
|
||||||
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
import java.util.*
|
import java.util.*
|
||||||
import java.io.*
|
import java.io.*
|
||||||
|
|
||||||
var propertiesFile = rootProject.file("versions.properties");
|
var propertiesFile: File = rootProject.file("gradle/versions.properties")
|
||||||
if (!propertiesFile.exists()) {
|
if (!propertiesFile.exists()) {
|
||||||
//work-around for buildSrc
|
//work-around for buildSrc
|
||||||
propertiesFile = rootProject.file("../versions.properties");
|
propertiesFile = rootProject.file("../gradle/versions.properties")
|
||||||
}
|
}
|
||||||
|
|
||||||
FileReader(propertiesFile).use {
|
FileReader(propertiesFile).use {
|
||||||
val properties = Properties()
|
val properties = Properties()
|
||||||
properties.load(it)
|
properties.load(it)
|
||||||
Reference in New Issue
Block a user