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
9 changes: 4 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,24 @@ on:
jobs:
publish:
name: Publish library at mavenCentral
runs-on: ${{ matrix.os }}
runs-on: macos-latest
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v7
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: '17'
- name: Prebuild library
run: ./gradlew publishToMavenLocal
- name: Publish
run: ./gradlew publish -DIS_MAIN_HOST=${{ matrix.os == 'ubuntu-latest' }}
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
release:
name: Create release
needs: publish
Expand Down
15 changes: 10 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,24 @@ buildscript {
}
dependencies {
classpath(":graphics-build-logic")
classpath(libs.mokoGradlePlugin)
}
}

apply(plugin = "dev.icerock.moko.gradle.publication.nexus")

group = "dev.icerock.moko"
version = libs.versions.mokoGraphicsVersion.get()

allprojects {
plugins.withId("org.gradle.maven-publish") {
group = "dev.icerock.moko"
version = libs.versions.mokoGraphicsVersion.get()
}
group = "dev.icerock.moko"
version = rootProject.version

tasks.withType<KotlinCompile> {
compilerOptions.jvmTarget = JvmTarget.JVM_1_8
}

// fix Reason: Task ':graphics:publishJsPublicationToOSSRHRepository' uses this output of task ':graphics:signAndroidDebugPublication' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed.
// Ensure all publication tasks wait for generated signatures.
val signingTasks = tasks.withType<Sign>()
tasks.withType<AbstractPublishToMaven>().configureEach {
dependsOn(signingTasks)
Expand Down
7 changes: 7 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@ kotlin.mpp.stability.nowarn=true
kotlin.js.yarn=false

android.useAndroidX=true

moko.publish.name=MOKO graphics
moko.publish.description=Graphics primitives for mobile (android & ios) Kotlin Multiplatform development
moko.publish.repo.org=icerockdev
moko.publish.repo.name=moko-graphics
moko.publish.license=Apache-2.0
moko.publish.developers=Alex009|Aleksey Mikhailov|aleksey.mikhailov@icerockdev.com,nrobi144|Nagy Robert|nagyrobi144@gmail.com
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ mokoGraphicsVersion = "0.10.2"
appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
annotation = { module = "androidx.annotation:annotation", version.ref = "androidAnnotationVersion" }
mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" }
mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.6.1" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
1 change: 0 additions & 1 deletion graphics-build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ dependencies {
api("dev.icerock:mobile-multiplatform:0.14.2")
api("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
api("com.android.tools.build:gradle:8.2.2")
api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6")
}

This file was deleted.

18 changes: 0 additions & 18 deletions graphics-build-logic/src/main/kotlin/detekt-convention.gradle.kts

This file was deleted.

This file was deleted.

7 changes: 2 additions & 5 deletions graphics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@

plugins {
id("multiplatform-library-convention")
id("detekt-convention")
id("dev.icerock.moko.gradle.detekt")
id("dev.icerock.mobile.multiplatform.android-manifest")
id("publication-convention")
id("dev.icerock.moko.gradle.publication")
}

group = "dev.icerock.moko"
version = libs.versions.mokoGraphicsVersion.get()

dependencies {
androidMainImplementation(libs.annotation)
}
Expand Down
3 changes: 1 addition & 2 deletions sample/mpp-library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
plugins {
id("com.android.library")
id("android-base-convention")
id("detekt-convention")
id("dev.icerock.moko.gradle.detekt")
id("org.jetbrains.kotlin.multiplatform")
id("dev.icerock.mobile.multiplatform.android-manifest")
id("dev.icerock.mobile.multiplatform.ios-framework")
Expand Down Expand Up @@ -34,4 +34,3 @@ dependencies {
android {
namespace = "com.icerockdev.library"
}