diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 13592f3d..e0a442ac 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,7 +11,7 @@ repositories { } -val javaLangVersion = 11 +val javaLangVersion = 17 java { toolchain.languageVersion.set(JavaLanguageVersion.of(javaLangVersion)) diff --git a/buildSrc/src/main/kotlin/Xtras.kt b/buildSrc/src/main/kotlin/Xtras.kt index 9d50c3b9..e7b819de 100644 --- a/buildSrc/src/main/kotlin/Xtras.kt +++ b/buildSrc/src/main/kotlin/Xtras.kt @@ -3,8 +3,8 @@ import org.gradle.plugin.use.PluginDependencySpec object Xtras { const val projectGroup = "org.danbrough.kotlinxtras" - const val version = "0.0.3-beta16" - const val publishingVersion = "0.0.3-beta16" + const val version = "0.0.3-beta17" + const val publishingVersion = "0.0.3-beta17" const val repoName = "xtras" const val javaLangVersion = 11 } diff --git a/gradle.properties b/gradle.properties index 6120594f..c0e8b836 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,5 +25,5 @@ xtras.dir.packages=/usr/local/kotlinxtras/packages # otherwise everything is included #Print xtras log statements to stdout as well as the gradle log xtras.log.stdout=true -sonatypeRepoId=orgdanbrough-1484 +sonatypeRepoId=orgdanbrough-1485 bootstrap=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7420a462..8707e8b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 5fdff91a..5cecb65b 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -5,6 +5,8 @@ plugins { xtras("sonatype") } + + repositories { mavenCentral() } diff --git a/plugin/src/main/kotlin/org/danbrough/kotlinxtras/binaries/BinaryPlugin.kt b/plugin/src/main/kotlin/org/danbrough/kotlinxtras/binaries/BinaryPlugin.kt index 15ab6e7a..748ee9b3 100644 --- a/plugin/src/main/kotlin/org/danbrough/kotlinxtras/binaries/BinaryPlugin.kt +++ b/plugin/src/main/kotlin/org/danbrough/kotlinxtras/binaries/BinaryPlugin.kt @@ -170,23 +170,27 @@ open class BinaryExtension { const val XTRAS_BINARIES_EXTN_NAME = "xtrasBinaries" + +val binaryProperty: Project.(String, String) -> String = { exe, defValue -> + projectProperty("$binaryPropertyPrefix.$exe", defValue) +} + +const val binaryPropertyPrefix = "xtras.bin" + + class BinaryPlugin : Plugin { override fun apply(target: Project) { target.log("Initializing BinaryPlugin...") target.extensions.create(XTRAS_BINARIES_EXTN_NAME, BinaryExtension::class.java).apply { - val binaryPropertyPrefix = "xtras.bin" - val binaryProperty: (String, String) -> String = { exe, defValue -> - target.projectProperty("$binaryPropertyPrefix.$exe", defValue) - } - gitBinary = binaryProperty("git", gitBinary) - wgetBinary = binaryProperty("wget", wgetBinary) - goBinary = binaryProperty("go", goBinary) - tarBinary = binaryProperty("tar", tarBinary) - autoreconfBinary = binaryProperty("autoreconf", autoreconfBinary) - makeBinary = binaryProperty("make", makeBinary) - cmakeBinary = binaryProperty("cmake", cmakeBinary) + gitBinary = target.binaryProperty("git", gitBinary) + wgetBinary = target.binaryProperty("wget", wgetBinary) + goBinary = target.binaryProperty("go", goBinary) + tarBinary = target.binaryProperty("tar", tarBinary) + autoreconfBinary = target.binaryProperty("autoreconf", autoreconfBinary) + makeBinary = target.binaryProperty("make", makeBinary) + cmakeBinary = target.binaryProperty("cmake", cmakeBinary) target.tasks.register("xtrasConfig") {