azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[repo] Fix 'prepare-deps' sub-project was not included in build

Browse Source
This commit is contained in:
Yahor Berdnikau
2023-07-18 10:25:03 +02:00
committed by Space Team
parent 45d8a8e56a
commit 9294a74bf2
2 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repo/gradle-build-conventions/buildsrc-compat/build.gradle.kts
-26
View File
@@ -17,10 +17,6 @@ logger.info("buildSrcKotlinVersion: " + extra["bootstrapKotlinVersion"])
logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
apply {
from("../../../gradle/checkCacheability.gradle.kts")
}
plugins {
`kotlin-dsl`
`java-gradle-plugin`
@@ -40,28 +36,6 @@ gradlePlugin {
}
}
fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
val v = it.toString()
if (v.isBlank()) true
else v.toBoolean()
}
project.apply {
from(rootProject.file("../../gradle/versions.gradle.kts"))
}
val isTeamcityBuild = kotlinBuildProperties.isTeamcityBuild
val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
extra["intellijReleaseType"] = when {
extra["versions.intellijSdk"]?.toString()?.contains("-EAP-") == true -> "snapshots"
extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true -> "nightly"
else -> "releases"
}
extra["versions.androidDxSources"] = "5.0.0_r2"
extra["customDepsOrg"] = "kotlin.build"
repositories {
mavenCentral()
google()
repo/gradle-build-conventions/buildsrc-compat/prepare-deps/build.gradle.kts → repo/gradle-build-conventions/prepare-deps/build.gradle.kts
+27 -7
View File
@@ -13,15 +13,36 @@ import javax.xml.stream.XMLOutputFactory
plugins {
base
id("org.jetbrains.kotlin.jvm")
}
val intellijReleaseType: String by rootProject.extra
val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
val v = it.toString()
if (v.isBlank()) true
else v.toBoolean()
}
project.apply {
from(rootProject.file("../../gradle/versions.gradle.kts"))
}
val isTeamcityBuild = kotlinBuildProperties.isTeamcityBuild
val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
val intellijReleaseType: String by extra {
when {
extra["versions.intellijSdk"]?.toString()?.contains("-EAP-") == true -> "snapshots"
extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true -> "nightly"
else -> "releases"
}
}
val customDepsOrg: String by extra("kotlin.build")
val intellijVersion = project.extra["versions.intellijSdk"] as String
val intellijVersionForIde = rootProject.intellijSdkVersionForIde()
val asmVersion = rootProject.findProperty("versions.jar.asm-all") as String?
val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String?
val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String?
val intellijSeparateSdks: Boolean by rootProject.extra
val asmVersion = project.findProperty("versions.jar.asm-all") as String?
val androidStudioRelease = project.findProperty("versions.androidStudioRelease") as String?
val androidStudioBuild = project.findProperty("versions.androidStudioBuild") as String?
fun checkIntellijVersion(intellijVersion: String) {
val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-'))
@@ -92,7 +113,6 @@ val dependenciesDir = (findProperty("kotlin.build.dependencies.dir") as String?)
val customDepsRepoDir = dependenciesDir.resolve("repo")
val customDepsOrg: String by rootProject.extra
val repoDir = File(customDepsRepoDir, customDepsOrg)
dependencies {