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
7 changes: 6 additions & 1 deletion .github/workflows/deploy-android-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ name: Deploy package for Android
on:
workflow_dispatch:

# Le bloc 'env' qui fonctionne configuration Gradle
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: "1.0.0-rc13-finalcad"
VERSION: "1.0.0-rc17-finalcad"
#gpr.user: ${{ github.actor }}
#gpr.key: ${{ secrets.GITHUB_TOKEN }}

jobs:
buildAndPush:
Expand All @@ -30,3 +33,5 @@ jobs:

- name: Publish all packages to GitHub Packages
run: ./gradlew publish
#- name: Publish to GitHub Packages
# run: ./gradlew richeditor-compose:publishMavenPublicationToGitHubPackagesRepository
29 changes: 21 additions & 8 deletions convention-plugins/src/main/kotlin/module.publication.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,21 @@ import org.gradle.kotlin.dsl.`maven-publish`

plugins {
`maven-publish`
signing
// signing
}

publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/FinalCAD/Compose-Rich-Editor")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}

// Configure all publications
publications.withType<MavenPublication> {
// Stub javadoc.jar artifact
Expand All @@ -20,7 +31,7 @@ publishing {
pom {
name.set("Compose Rich Editor")
description.set("A Compose multiplatform library that provides a rich text editor.")
url.set("https://github.com/MohamedRejeb/Compose-Rich-Editor")
url.set("https://github.com/FinalCAD/Compose-Rich-Editor")

licenses {
license {
Expand All @@ -30,11 +41,11 @@ publishing {
}
issueManagement {
system.set("Github")
url.set("https://github.com/MohamedRejeb/Compose-Rich-Editor/issues")
url.set("https://github.com/FinalCAD/Compose-Rich-Editor/issues")
}
scm {
connection.set("https://github.com/MohamedRejeb/Compose-Rich-Editor.git")
url.set("https://github.com/MohamedRejeb/Compose-Rich-Editor")
connection.set("https://github.com/FinalCAD/Compose-Rich-Editor.git")
url.set("https://github.com/FinalCAD/Compose-Rich-Editor")
}
developers {
developer {
Expand All @@ -47,6 +58,7 @@ publishing {
}
}

/*
signing {
useInMemoryPgpKeys(
System.getenv("OSSRH_GPG_SECRET_KEY_ID"),
Expand All @@ -55,8 +67,9 @@ signing {
)
sign(publishing.publications)
}
*/

// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
dependsOn(project.tasks.withType(Sign::class.java))
}
// project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
// dependsOn(project.tasks.withType(Sign::class.java))
// }
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
plugins {
id("io.github.gradle-nexus.publish-plugin")
// id("io.github.gradle-nexus.publish-plugin")
}

allprojects {
group = "com.mohamedrejeb.richeditor"
version = System.getenv("VERSION") ?: "1.0.0-rc13"
group = "com.finalcad.richeditor"
version = System.getenv("VERSION") ?: "1.0.0-rc17-finalcad"
}

/*
nexusPublishing {
// Configure maven central repository
// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
Expand All @@ -20,3 +21,4 @@ nexusPublishing {
}
}
}
*/
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.8.2"
agp = "8.11.2"
kotlin = "2.1.21"
compose = "1.8.2"
dokka = "2.0.0"
Expand All @@ -20,6 +20,7 @@ android-minSdk = "21"
android-compileSdk = "35"
lifecycle = "2.9.0"
navigation = "2.9.0-beta01"
uiToolingPreviewAndroid = "1.9.0"

[libraries]
ksoup-html = { module = "com.mohamedrejeb.ksoup:ksoup-html", version.ref = "ksoup" }
Expand Down Expand Up @@ -49,6 +50,7 @@ ktor-client-wasm = { module = "io.ktor:ktor-client-js-wasm-js", version.ref = "k

lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation" }
androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }

[plugins]
androidLibrary = { id = "com.android.library", version.ref = "agp" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading