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 .github/workflows/publish-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
- run: |
./gradlew librarianPublishToMavenSnapshots
./gradlew librarianPublishToSnapshots
env:
LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.LIBRARIAN_SONATYPE_USERNAME }}
LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.LIBRARIAN_SONATYPE_PASSWORD }}
Expand Down
6 changes: 2 additions & 4 deletions build-logic/src/main/kotlin/main.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import com.android.build.api.dsl.CommonExtension
import com.gradleup.librarian.gradle.*
import com.gradleup.librarian.gradle.Librarian.Companion
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension

private fun Project.configureAndroid(namespace: String) {
configureAndroidCompatibility(23, 35, 35)

configureJavaCompatibility(17)
//configureKotlinCompatibility(librarianProperties().kotlinCompatibility() ?: error("no kotlin compatibility found"))
configureKotlinCompatibility("2.0.0")

extensions.getByType(CommonExtension::class.java).apply {
this.namespace = namespace
Expand Down Expand Up @@ -47,7 +46,6 @@ private fun Project.configureKMP() {
fun Project.library(
namespace: String,
compose: Boolean = false,
publish: Boolean = false,
kotlin: (KotlinMultiplatformExtension) -> Unit
) {
val kotlinMultiplatformExtension = applyKotlinMultiplatformPlugin()
Expand All @@ -61,7 +59,7 @@ fun Project.library(

kotlin(kotlinMultiplatformExtension)

librarianModule(publish)
Librarian.module(project)
}

fun Project.androidApp(
Expand Down
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.gradleup.librarian.gradle.librarianRoot
import com.gradleup.librarian.gradle.Librarian

buildscript {
repositories {
Expand Down Expand Up @@ -26,6 +26,7 @@ buildscript {
}
}
}

Librarian.root(project)
apply(plugin = "com.github.ben-manes.versions")
apply(plugin = "nl.littlerobots.version-catalog-update")

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jetbrains-kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotl
jetbrains-kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "jetbrains-kotlin-coroutines" }
jetbrains-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "jetbrains-kotlinx-datetime" }
jetbrains-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "jetbrains-kotlinx-serialization" }
librarian = "com.gradleup.librarian:librarian-gradle-plugin:0.0.4"
librarian = "com.gradleup.librarian:librarian-gradle-plugin:0.0.7"
lyricist = { module = "cafe.adriel.lyricist:lyricist", version.ref = "lyricist" }
touchlab-kermit = { module = "co.touchlab:kermit", version.ref = "touchlab-kermit" }
vanniktech-multiplatform-locale = { module = "com.vanniktech:multiplatform-locale", version.ref = "multiplatform-locale" }
Expand Down
1 change: 0 additions & 1 deletion librarian.properties → librarian.root.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ pom.description=openfeedback-sdk-kotlin
pom.vcsUrl=https://github.com/paug/openfeedback-sdk-kotlin
pom.developer=openfeedback-sdk-kotlin authors
pom.license=MIT License
pom.licenseUrl=https://raw.githubusercontent.com/paug/openfeedback-sdk-kotlin/main/LICENSE
1 change: 0 additions & 1 deletion openfeedback-m3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
library(
namespace = "io.openfeedback.m3",
compose = true,
publish = true,
) { kotlinMultiplatformExtension ->
kotlinMultiplatformExtension.sourceSets {
findByName("commonMain")!!.apply {
Expand Down
1 change: 0 additions & 1 deletion openfeedback-resources/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {

library(
namespace = "io.openfeedback.resources",
publish = true,
) {
it.sourceSets {
findByName("commonMain")!!.apply {
Expand Down
1 change: 0 additions & 1 deletion openfeedback-ui-models/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
library(
namespace = "io.openfeedback.ui.models",
compose = true,
publish = true,
) { kotlinMultiplatformExtension ->
kotlinMultiplatformExtension.sourceSets {
getByName("commonMain") {
Expand Down
1 change: 0 additions & 1 deletion openfeedback-viewmodel/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ plugins {
library(
namespace = "io.openfeedback.viewmodels",
compose = true,
publish = true,
) { kotlinMultiplatformExtension ->
kotlinMultiplatformExtension.sourceSets {
getByName("commonMain") {
Expand Down
1 change: 0 additions & 1 deletion openfeedback/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {

library(
namespace = "io.openfeedback",
publish = true
) {
it.sourceSets {
getByName("commonMain").apply {
Expand Down
1 change: 1 addition & 0 deletions sample-app-shared/librarian.module.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
publish=false
4 changes: 2 additions & 2 deletions scripts/release.main.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ fun runCommand(vararg args: String): String {
}

fun setCurrentVersion(version: String) {
val gradleProperties = File("librarian.properties")
val gradleProperties = File("librarian.root.properties")
val newContent = gradleProperties.readLines().map {
it.replace(Regex("pom.version=.*"), "pom.version=\"$version\"")
}.joinToString(separator = "\n", postfix = "\n")
gradleProperties.writeText(newContent)
}

fun getCurrentVersion(): String {
val versionLines = File("librarian.properties").readLines().filter { it.startsWith("pom.version=") }
val versionLines = File("librarian.root.properties").readLines().filter { it.startsWith("pom.version=") }

require(versionLines.isNotEmpty()) {
"cannot find the version in ./gradle.properties"
Expand Down
Loading