diff --git a/.gitmodules b/.gitmodules index bd8576c..0c2c2b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "libs/DiamondBank-OG"] path = libs/DiamondBank-OG url = https://github.com/true-og/DiamondBank-OG -[submodule "libs/Chat-OG"] - path = libs/Chat-OG - url = https://github.com/true-og/Chat-OG diff --git a/build.gradle.kts b/build.gradle.kts index 068a522..6bfdaf3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,9 +65,9 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2") // Import Kotlin async library. compileOnlyApi(project(":libs:Utilities-OG")) // Import TrueOG Network Utilities-OG Java API (from source). compileOnlyApi(project(":libs:GxUI-OG")) // Import TrueOG Network GxUI-OG Java API (from source). - compileOnlyApi(project(":libs:Chat-OG")) { - attributes { attribute(kotlinAttribute, true) } - } // Import TrueOG Network Chat-OG Kotlin API (from source). + compileOnlyApi( + files("libs/Chat-OG/Chat-OG.jar") + ) // Import Chat-OG API (vendored jar until the API lands in true-og/Chat-OG). compileOnlyApi(project(":libs:DiamondBank-OG")) { attributes { attribute(kotlinAttribute, true) } } // Import TrueOG network DiamondBank-OG Kotlin API (from source). @@ -86,6 +86,9 @@ tasks.shadowJar { relocationPrefix = "${project.group}.shadow" archiveClassifier.set("") // Use empty string instead of null. minimize() + from("libs/Chat-OG/LICENSE") { + into("META-INF/licenses/libs/Chat-OG") + } // Bundle the vendored Chat-OG jar's license. } tasks.jar { archiveClassifier.set("part") } // Applies to root jarfile only. diff --git a/libs/Chat-OG b/libs/Chat-OG deleted file mode 160000 index 9a0ba40..0000000 --- a/libs/Chat-OG +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a0ba40039287c35488319947385051a8ec11827 diff --git a/libs/Chat-OG/Chat-OG.jar b/libs/Chat-OG/Chat-OG.jar new file mode 100644 index 0000000..45297b9 Binary files /dev/null and b/libs/Chat-OG/Chat-OG.jar differ diff --git a/libs/Chat-OG/LICENSE b/libs/Chat-OG/LICENSE new file mode 100644 index 0000000..3c577b0 --- /dev/null +++ b/libs/Chat-OG/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 5ab5f3d..e5d25db 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ ProcessBuilder("sh", "bootstrap.sh").directory(rootDir).inheritIO().start().let file("libs") .listFiles() - ?.filter { it.isDirectory && !it.name.startsWith(".") } + ?.filter { it.isDirectory && !it.name.startsWith(".") && file("${it.path}/build.gradle.kts").exists() } ?.forEach { dir -> include(":libs:${dir.name}") project(":libs:${dir.name}").projectDir = dir