Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bcv = "org.jetbrains.kotlinx:binary-compatibility-validator:0.16.3"
bouncycastle-pg = "org.bouncycastle:bcpg-jdk18on:1.78.1"
bouncycastle-prov = "org.bouncycastle:bcprov-jdk18on:1.78.1"
clikt = "com.github.ajalt.clikt:clikt:3.5.0"
tapmoc = "com.gradleup.tapmoc:tapmoc-gradle-plugin:0.2.0"
tapmoc = "com.gradleup.tapmoc:tapmoc-gradle-plugin:0.3.2"
tapmoc-at-build-time = "com.gradleup.tapmoc:tapmoc-gradle-plugin:0.2.1-SNAPSHOT-dda1362c1d0f8389f50b362a08967793e320cf29"
coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0-Beta"
Expand Down
2 changes: 1 addition & 1 deletion librarian-gradle-plugin/api/librarian-gradle-plugin.api
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public final class com/gradleup/librarian/gradle/MavenKt {

public final class com/gradleup/librarian/gradle/ModuleKt {
public static final fun librarianModule (Lorg/gradle/api/Project;)V
public static final fun librarianModule (Lorg/gradle/api/Project;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/gradleup/librarian/gradle/Bcv;Ljava/lang/String;Lcom/gradleup/librarian/gradle/Publishing;Lcom/gradleup/librarian/gradle/Signing;)V
public static final fun librarianModule (Lorg/gradle/api/Project;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;ZLcom/gradleup/librarian/gradle/Bcv;Ljava/lang/String;Lcom/gradleup/librarian/gradle/Publishing;Lcom/gradleup/librarian/gradle/Signing;)V
}

public abstract class com/gradleup/librarian/gradle/Plugin : org/gradle/api/Plugin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package com.gradleup.librarian.gradle
import com.gradleup.librarian.core.tooling.init.modulePropertiesFilename
import com.gradleup.librarian.core.tooling.init.rootPropertiesFilename
import com.gradleup.librarian.gradle.internal.findEnvironmentVariable
import tapmoc.configureJavaCompatibility
import tapmoc.configureKotlinCompatibility
import org.gradle.api.Project
import tapmoc.TapmocExtension
import java.time.Duration
import java.util.Properties
import java.util.*

internal fun Properties.javaCompatibility(): Int {
return getRequiredProperty("java.compatibility").toInt()
Expand All @@ -21,6 +20,10 @@ internal fun Properties.versionPackageName(): String? {
return getProperty("version.packageName")
}

internal fun Properties.checkDependencies(): Boolean {
return getProperty("checkDependenciesCompatibility")?.toBoolean() ?: true
}

internal fun Properties.publish(): Boolean? {
return getProperty("publish")?.toBoolean()
}
Expand Down Expand Up @@ -91,6 +94,7 @@ fun Project.librarianModule() {
version = updateVersionAccordingToEnvironment(rootProperties.getRequiredProperty("pom.version")),
jvmTarget = rootProperties.javaCompatibility(),
kotlinTarget = rootProperties.kotlinCompatibility(),
checkDependencies = rootProperties.checkDependencies(),
bcv = bcv,
versionPackageName = moduleProperties.versionPackageName(),
publishing = Publishing(
Expand Down Expand Up @@ -120,6 +124,7 @@ fun Project.librarianModule(
version: String,
jvmTarget: Int?,
kotlinTarget: String?,
checkDependencies: Boolean,
bcv: Bcv?,
versionPackageName: String?,
publishing: Publishing?,
Expand All @@ -131,8 +136,18 @@ fun Project.librarianModule(
this.group = group
this.version = version

jvmTarget?.let(::configureJavaCompatibility)
kotlinTarget?.let(::configureKotlinCompatibility)
pluginManager.apply("com.gradleup.tapmoc")
project.extensions.getByType(TapmocExtension::class.java).apply {
if (jvmTarget != null) {
java(jvmTarget)
}
if (kotlinTarget != null) {
kotlin(kotlinTarget)
}
if (checkDependencies) {
checkDependencies()
}
}

if (versionPackageName != null) {
configureGeneratedVersion(versionPackageName, version)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@ fun Project.librarianRoot(
gcs: Gcs?,
kdoc: Kdoc,
) {
librarianModule(group, version, null, null, null, null, publishing, signing)
librarianModule(
group = group,
version = version,
jvmTarget = null,
kotlinTarget = null,
checkDependencies = false,
bcv = null,
versionPackageName = null,
publishing = publishing,
signing = signing
)

pluginManager.apply("com.gradleup.nmcp.aggregation")
pluginManager.apply("com.gradleup.nmcp")
Expand Down