Migrated all entities from YDWk to YDE (#141)

YDWK · Mar 7, 2023 · a5ce930 · a5ce930
1 parent 8076827
commit a5ce930
Show file tree

Hide file tree

Showing 454 changed files with 456 additions and 20,760 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![License: Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![codecov](https://codecov.io/gh/YDWK/YDWK/branch/master/graph/badge.svg?token=LKIA8T6N6J)](https://codecov.io/gh/YDWK/YDWK)
-[![ydwk](https://img.shields.io/badge/YDWK--Version-v1.2.0-blue)](https://github.com/YDWK/YDWK/releases/tag/v1.2.0)
+[![ydwk](https://img.shields.io/badge/YDWK--Version-v1.3.0-blue)](https://github.com/YDWK/YDWK/releases/tag/v1.3.0)
 [![ydwk-docs](https://img.shields.io/badge/YDWK-Docs-blue.svg)](https://www.ydwk.org)
 
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 buildscript {
     repositories { mavenCentral() }
 
-    dependencies { classpath("org.jetbrains.dokka:dokka-base:1.7.20") }
+    dependencies {
+        classpath("org.jetbrains.dokka:dokka-base:1.8.10")
+        classpath("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0")
+    }
 }
 
 plugins {
@@ -22,6 +25,8 @@ plugins {
     jacoco // code coverage reports
 }
 
+apply(plugin = "io.codearte.nexus-staging")
+
 extra.apply {
     set("name", "YDWK")
     set("description", "YDWK (Yusuf's Discord Wrapper Kotlin) My own Discord Wrapper in Kotlin")
@@ -38,14 +43,14 @@ group = "io.github.realyusufismail" // used for publishing. DON'T CHANGE
 
 val releaseVersion by extra(!version.toString().endsWith("-SNAPSHOT"))
 
-apply(from = "gradle/tasks/checkEntities.gradle.kts")
-
 apply(from = "gradle/tasks/incrementVersion.gradle.kts")
 
 apply(from = "gradle/tasks/checkEvents.gradle.kts")
 
 apply(from = "gradle/tasks/eventClassJavaDocChecker.gradle")
 
+apply(from = "gradle/tasks/Nexus.gradle")
+
 repositories { mavenCentral() }
 
 dependencies {
@@ -67,6 +72,9 @@ dependencies {
     api("com.neovisionaries:nv-websocket-client:" + properties["nvWebsocketClientVersion"])
     api("com.codahale:xsalsa20poly1305:" + properties["xsalsa20poly1305Version"])
 
+    // YDE Entities
+    api("io.github.realyusufismail:yde:" + properties["ydeVersion"])
+
     // kotlin
     api(
         "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
@@ -89,7 +97,6 @@ tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "11" }
 tasks.build {
     // dependsOn on custom tasks
     dependsOn(tasks.getByName("checkEvents")) // check if events are valid
-    dependsOn(tasks.getByName("checkEntities")) // check if entities are valid
     dependsOn(tasks.getByName("eventClassJavaDocChecker")) // check if event classes have javadoc
     dependsOn(tasks.test) // run tests before building
 
@@ -157,10 +164,7 @@ spotless {
 
 detekt {
     // only check javadoc in io/github/ydwk/ydwk/entities and io/github/ydwk/ydwk/evm/event/events
-    source =
-        files(
-            "src/main/kotlin/io/github/ydwk/ydwk/entities",
-            "src/main/kotlin/io/github/ydwk/ydwk/evm/event/events")
+    source = files("src/main/kotlin/io/github/ydwk/ydwk/evm/event/events")
     config = files("gradle/config/detekt.yml")
     baseline = file("gradle/config/detekt-baseline.xml")
     allRules = false

diff --git a/gradle.properties b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.daemon=true
 kotlin.code.style=official
-version = 1.2.5-SNAPSHOT
+version = 1.3.0
 
 ## Dependencies Versions and Plugin
 
 # Plugins
 jvmVersion = 1.8.10
 pluginAllOpenVersion = 1.8.10
 spotlessVersion = 6.12.0
-dokkaVersion = 1.7.20
+dokkaVersion = 1.8.10
 detektVersion = 1.22.0
 
 # Dependencies
@@ -19,6 +19,7 @@ sysoutOverSlf4jVersion = 1.0.2
 jconfigVersion = 1.0.8
 okhttp3Version = 5.0.0-alpha.11
 nvWebsocketClientVersion = 2.14
+ydeVersion = 1.0.1
 kotlinTestVersion = 1.8.10
 kotlinxCoroutinesCoreVersion = 1.6.4
 jsr305Version = 3.0.2

diff --git a/gradle/tasks/Nexus.gradle b/gradle/tasks/Nexus.gradle
@@ -0,0 +1,6 @@
+nexusStaging {
+    packageGroup = 'io.github.realyusufismail'
+    serverUrl = "https://s01.oss.sonatype.org/service/local"
+    username = project.hasProperty('MAVEN_USERNAME') ? project.property('MAVEN_USERNAME') : 'username'
+    password = project.hasProperty('MAVEN_PASSWORD') ? project.property('MAVEN_PASSWORD') : 'password'
+}
diff --git a/gradle/tasks/checkEntities.gradle.kts b/gradle/tasks/checkEntities.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/github/ydwk/ydwk/Activity.kt b/src/main/kotlin/io/github/ydwk/ydwk/Activity.kt
@@ -18,7 +18,7 @@
  */ 
 package io.github.ydwk.ydwk
 
-import io.github.ydwk.ydwk.util.Checks
+import io.github.ydwk.yde.util.Checks
 import io.github.ydwk.ydwk.ws.util.ActivityType
 import java.util.regex.Pattern
 

diff --git a/src/main/kotlin/io/github/ydwk/ydwk/BotBuilder.kt b/src/main/kotlin/io/github/ydwk/ydwk/BotBuilder.kt
@@ -18,9 +18,9 @@
  */ 
 package io.github.ydwk.ydwk
 
-import io.github.ydwk.ydwk.cache.CacheIds
-import io.github.ydwk.ydwk.impl.YDWKImpl
-import io.github.ydwk.ydwk.util.exception.LoginException
+import io.github.ydwk.yde.cache.CacheIds
+import io.github.ydwk.yde.impl.YDWKImpl
+import io.github.ydwk.yde.util.exception.LoginException
 import javax.annotation.CheckReturnValue
 import okhttp3.OkHttpClient