forked from kordlib/kord
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use libs.versions.toml and clean gradle files
Declaring the version catalog in libs.versions.toml instead of settings.gradle.kts has the advantage that it can be reused in buildSrc. It also introduces a single place to define dependencies and their version. General cleanup of gradle files was also done, including: * using default output for dokka: relying on defaults means less config and maintenance burden * removing DocsTask because it was unused, last usage of this custom task was removed in kordlib#367 * getting rid of the source set workaround introduced in kordlib#386 by moving TweetNaclFast from voice/src/main/kotlin to voice/src/main/java
- Loading branch information
1 parent
3298e4b
commit e721794
Showing
20 changed files
with
211 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ jobs: | |
| - name: Push docs to gh-pages | ||
| uses: JamesIves/github-pages-deploy-action@v4 | ||
| with: | ||
| folder: dokka | ||
| folder: build/dokka/htmlMultiModule | ||
| branch: gh-pages | ||
| git-config-name: GitHub Actions | ||
| git-config-email: [email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ | |
| .gradle/ | ||
| .idea/ | ||
| out/ | ||
| dokka/ | ||
|
|
||
| **/build/* | ||
| !**/build/generated/ | ||
|
|
||
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,10 @@ | ||
| // avoids warning: | ||
| // "Project accessors enabled, but root project name not explicitly set for 'buildSrc'. Checking out the project in | ||
| // different folders will impact the generated code and implicitly the buildscript classpath, breaking caching." | ||
| rootProject.name = "buildSrc" | ||
|
|
||
| dependencyResolutionManagement { | ||
| @Suppress("UnstableApiUsage") | ||
| versionCatalogs { | ||
| create("libs") { | ||
| from(files("../gradle/libs.versions.toml")) | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,73 +5,71 @@ plugins { | |
| signing | ||
| } | ||
|
|
||
| tasks { | ||
| publishing { | ||
| publications { | ||
| create<MavenPublication>(Library.name) { | ||
| groupId = Library.group | ||
| artifactId = "kord-${project.name}" | ||
| version = Library.version | ||
| publishing { | ||
| publications { | ||
| create<MavenPublication>(Library.name) { | ||
| groupId = Library.group | ||
| artifactId = "kord-${project.name}" | ||
| version = Library.version | ||
|
|
||
| pom { | ||
| name.set(Library.name) | ||
| description.set(Library.description) | ||
| url.set(Library.projectUrl) | ||
| pom { | ||
| name.set(Library.name) | ||
| description.set(Library.description) | ||
| url.set(Library.projectUrl) | ||
|
|
||
| organization { | ||
| name.set("Kord") | ||
| url.set("https://github.com/kordlib") | ||
| } | ||
| organization { | ||
| name.set("Kord") | ||
| url.set("https://github.com/kordlib") | ||
| } | ||
|
|
||
| developers { | ||
| developer { | ||
| name.set("The Kord Team") | ||
| } | ||
| developers { | ||
| developer { | ||
| name.set("The Kord Team") | ||
| } | ||
| } | ||
|
|
||
| issueManagement { | ||
| system.set("GitHub") | ||
| url.set("https://github.com/kordlib/kord/issues") | ||
| } | ||
| issueManagement { | ||
| system.set("GitHub") | ||
| url.set("https://github.com/kordlib/kord/issues") | ||
| } | ||
|
|
||
| licenses { | ||
| license { | ||
| name.set("MIT") | ||
| url.set("http://opensource.org/licenses/MIT") | ||
| } | ||
| } | ||
| scm { | ||
| connection.set("scm:git:ssh://github.com/kordlib/kord.git") | ||
| developerConnection.set("scm:git:ssh://[email protected]:kordlib/kord.git") | ||
| url.set(Library.projectUrl) | ||
| licenses { | ||
| license { | ||
| name.set("MIT") | ||
| url.set("http://opensource.org/licenses/MIT") | ||
| } | ||
| } | ||
|
|
||
| if (!isJitPack) { | ||
| repositories { | ||
| maven { | ||
| url = if (Library.isSnapshot) uri(Repo.snapshotsUrl) | ||
| else uri(Repo.releasesUrl) | ||
| scm { | ||
| connection.set("scm:git:ssh://github.com/kordlib/kord.git") | ||
| developerConnection.set("scm:git:ssh://[email protected]:kordlib/kord.git") | ||
| url.set(Library.projectUrl) | ||
| } | ||
| } | ||
|
|
||
| credentials { | ||
| username = System.getenv("NEXUS_USER") | ||
| password = System.getenv("NEXUS_PASSWORD") | ||
| } | ||
| if (!isJitPack) { | ||
| repositories { | ||
| maven { | ||
| url = uri(if (Library.isSnapshot) Repo.snapshotsUrl else Repo.releasesUrl) | ||
|
|
||
| credentials { | ||
| username = System.getenv("NEXUS_USER") | ||
| password = System.getenv("NEXUS_PASSWORD") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!isJitPack && Library.isRelease) { | ||
| signing { | ||
| val signingKey = findProperty("signingKey")?.toString() | ||
| val signingPassword = findProperty("signingPassword")?.toString() | ||
| if (signingKey != null && signingPassword != null) { | ||
| useInMemoryPgpKeys(String(Base64.getDecoder().decode(signingKey)), signingPassword) | ||
| } | ||
| sign(publishing.publications[Library.name]) | ||
| if (!isJitPack && Library.isRelease) { | ||
| signing { | ||
| val signingKey = findProperty("signingKey")?.toString() | ||
| val signingPassword = findProperty("signingPassword")?.toString() | ||
| if (signingKey != null && signingPassword != null) { | ||
| useInMemoryPgpKeys(String(Base64.getDecoder().decode(signingKey)), signingPassword) | ||
| } | ||
| sign(publishing.publications[Library.name]) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| plugins { | ||
| kotlin("jvm") | ||
| org.jetbrains.kotlin.jvm | ||
| } | ||
|
|
||
| sourceSets { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.