Skip to content
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

Version bumps and sandbox rework #47

Merged
merged 7 commits into from
Dec 23, 2021
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
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
root = true

[*]
[*.{kt,kts}]
indent_size = 2
continuation_indent_size = 4
ij_kotlin_name_count_to_use_star_import = unset
disabled_rules = no-wildcard-imports
14 changes: 10 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# v0.0.1
# v0.0.2
## Versions
* JDK: 11+
* Kotlin: 1.5.31
* Compose: 1.0.0-rc4
* Kotlin: 1.6.10
* Compose: 1.0.1
## Changes
* Upgraded Kotlin and Compose versions
* Fixed teardown hooks on some components
* Revisited old components to make all of them controlled for consistency
* Reworked sandbox
* MDCTypography extended to support custom attributes
### New modules wrapped
- [ ] mdc-xxx
- [x] mdc-radio
- [x] material-icons

# v0.0.1
## Versions
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,6 @@ Other libraries:
# Contributing
All contributions are welcome. Have a look for
a [good first issue](https://github.com/mpetuska/kmdc/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
in the issue tracker, or open your own issue if you have some ideas.
If you want to chat, ping me on [slack](https://kotlinlang.slack.com/team/UL1A5BA2X).
in the issue tracker, or open your own issue if you have some ideas. If you want to chat, either start
a [discussion](https://github.com/mpetuska/kmdc/discussions) or ping me
on [slack](https://kotlinlang.slack.com/team/UL1A5BA2X).
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
id("plugin.library-compose")
id("plugin.publishing-nexus")
id("plugin.publishing-mpp")
id("plugin.yarn-lock-validation")
}

gradleEnterprise {
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins { `kotlin-dsl` }
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
plugins {
id("de.fayard.refreshVersions") version "0.23.0"
id("de.fayard.refreshVersions") version "0.30.1"
}
}

Expand Down
16 changes: 14 additions & 2 deletions buildSrc/src/main/kotlin/plugin.common.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import de.fayard.refreshVersions.core.versionFor
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinTest

Expand All @@ -20,8 +21,19 @@ idea {
}

spotless {
kotlin { ktfmt() }
kotlinGradle { ktfmt() }
val ktlintSettings = mapOf(
"indent_size" to "2",
"continuation_indent_size" to "4",
"disabled_rules" to "no-wildcard-imports"
)
kotlin {
target("src/**/*.kt")
ktlint(versionFor("version.ktlint")).userData(ktlintSettings)
}
kotlinGradle {
target("*.kts")
ktlint(versionFor("version.ktlint")).userData(ktlintSettings)
}
}

tasks {
Expand Down
8 changes: 6 additions & 2 deletions buildSrc/src/main/kotlin/plugin.git-hooks.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
plugins { id("com.github.jakemarsden.git-hooks") }
plugins {
id("com.github.jakemarsden.git-hooks")
}

gitHooks { setHooks(mapOf("pre-commit" to "spotlessApply", "pre-push" to "spotlessCheck")) }
gitHooks {
setHooks(mapOf("pre-commit" to "spotlessApply", "pre-push" to "spotlessCheck"))
}
13 changes: 6 additions & 7 deletions buildSrc/src/main/kotlin/plugin.publishing.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ tasks {
val jsMainClasses by getting
withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach { dependsOn(jsMainClasses) }
withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach { dependsOn(jsMainClasses) }

register<Jar>("javadocJar") {
// TODO uncomment once dokka fixes this shit
// dependsOn(dokkaHtml)
// from(dokkaHtml.get().outputDirectory)
dependsOn(dokkaHtml)
from(dokkaHtml)
archiveClassifier.set("javadoc")
}
withType<Jar> {
Expand Down Expand Up @@ -83,22 +82,22 @@ publishing {
name by project.name
url by "https://github.com/$ghOwnerId/${rootProject.name}"
description by project.description

licenses {
license {
name by "The Apache License, Version 2.0"
url by "https://www.apache.org/licenses/LICENSE-2.0.txt"
}
}

developers {
developer {
id by ghOwnerId
name by ghOwnerName
email by ghOwnerEmail
}
}

scm {
connection by "scm:git:git@github.com:$ghOwnerId/${rootProject.name}.git"
url by "https://github.com/$ghOwnerId/${rootProject.name}"
Expand Down
135 changes: 0 additions & 135 deletions buildSrc/src/main/kotlin/plugin.yarn-lock-validation.gradle.kts

This file was deleted.

2 changes: 2 additions & 0 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Contributing to KMDC
TODO
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading