Skip to content

Refactor Project #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 28, 2024
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fun App() {
}
}
```
See [`example`](example) module for more details.
See [`gallery`](gallery) module for more details.

- `FluentTheme()` is the context and entry point of the application, just like `MaterialTheme`
- Components are under `component` package
Expand Down
2 changes: 2 additions & 0 deletions build-plugin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/build/
/.gradle/
30 changes: 30 additions & 0 deletions build-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
plugins {
`kotlin-dsl`
`java-gradle-plugin`
}

repositories {
mavenCentral()
}

dependencies {
implementation(gradleApi())
implementation(kotlin("gradle-plugin"))
}

kotlin {
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}
}

gradlePlugin {
plugins {
create("BuildPlugin") {
id = "com.konyaco.fluent.plugin.build"
implementationClass = "com.konyaco.fluent.plugin.build.BuildPlugin"
}
}
}
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.konyaco.fluent.plugin.build

import org.gradle.api.JavaVersion

object BuildConfig {

const val group = "com.konyaco"

const val packageName = "$group.fluent"

const val libraryVersion = "0.0.1-dev.6"

object Android {
const val compileSdkVersion = 34

const val minSdkVersion = 24
}

object Jvm {
const val jvmToolchainVersion = 11
val javaVersion = JavaVersion.VERSION_11
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package com.konyaco.fluent.plugin.build

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.bundling.Jar
import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.findByType
import org.gradle.kotlin.dsl.withType
import org.gradle.plugins.signing.SigningExtension

class BuildPlugin : Plugin<Project> {
override fun apply(target: Project) {
target.allprojects.forEach {
it.afterEvaluate {

it.extensions.findByType<PublishingExtension>()?.apply {
setupMavenPublishing(it)
it.extensions.findByType<SigningExtension>()?.setupSigning(this)
}
}
}
}

private fun SigningExtension.setupSigning(publishing: PublishingExtension) {
useInMemoryPgpKeys(
System.getenv("SIGNING_KEY_ID"),
System.getenv("SIGNING_KEY"),
System.getenv("SIGNING_PASSWORD")
)
sign(publishing.publications)
}

private fun PublishingExtension.setupMavenPublishing(target: Project) {
val javadocJar = target.tasks.findByName("javadocJar") ?: target.tasks.create("javadocJar", Jar::class) {
archiveClassifier.set("javadoc")
}
publications.withType<MavenPublication> {
artifact(javadocJar)
pom {
name.set("compose-fluent-ui")
description.set("A Fluent Design UI library for compose-multiplatform.")
url.set("https://github.com/Konyaco/compose-fluent-ui")

licenses {
license {
name.set("The Apache License, Version 2.0")
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
}
}

developers {
developer {
name.set("Kon Yaco")
email.set("[email protected]")
url.set("https://github.com/Konyaco")
}
}

scm {
url.set("https://github.com/Konyaco/compose-fluent-ui")
connection.set("scm:git:git://github.com/Konyaco/compose-fluent-ui.git")
developerConnection.set("scm:git:ssh://github.com/Konyaco/compose-fluent-ui.git")
}
}
}
repositories {
maven {
val releasesUrl ="https://s01.oss.sonatype.org/content/repositories/snapshots/"
val snapshotsUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
name = "OSSRH"
url = target.uri(
if (target.version.toString().endsWith("SNAPSHOT")) releasesUrl
else snapshotsUrl
)
credentials {
username = System.getenv("OSSRH_USERNAME")
password = System.getenv("OSSRH_PASSWORD")
}
}
}
}
}
14 changes: 9 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import com.konyaco.fluent.plugin.build.BuildConfig

plugins {
kotlin("multiplatform") version "1.9.0" apply false
id("org.jetbrains.compose") version "1.5.0" apply false
id("com.android.library") version "7.4.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.compose) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
id("com.konyaco.fluent.plugin.build")
}

group = "com.konyaco"
group = BuildConfig.group

allprojects {
repositories {
Expand Down
12 changes: 0 additions & 12 deletions example/android/.gitignore

This file was deleted.

56 changes: 0 additions & 56 deletions example/android/build.gradle.kts

This file was deleted.

3 changes: 0 additions & 3 deletions example/android/src/main/res/values/strings.xml

This file was deleted.

5 changes: 0 additions & 5 deletions example/android/src/main/res/values/themes.xml

This file was deleted.

38 changes: 0 additions & 38 deletions example/common/build.gradle.kts

This file was deleted.

2 changes: 0 additions & 2 deletions example/common/src/androidMain/AndroidManifest.xml

This file was deleted.

31 changes: 0 additions & 31 deletions example/desktop/build.gradle.kts

This file was deleted.

Loading