0.5.x (#6)

* Kord 0.7 upgrade (#4) * Dependency updates * Package changes com.gitlab.kordlib.kordx.emoji -> dev.kord.kordx.emoji * Upgrade to 0.7+ Kord range * Update CHANGELOG.MD * Match style of installation instructions * Use static version number * Remove buildscript block * Add publishing block * Add signing/staging * dev.kord.kordx -> dev.kord.x * Update to Gradle 6.8 * Ci megration (#5) * Update deployment-ci.yml * Delete github-ci.yml * Fix branch namings * Move tones into companion object * Just to trigger that CI * Document functions * make gradlew executable * Make Skintone an Enum * Don't rely on jdk9 * Actually migrate to maven (#7) * Migrate to maven * Add kts triggers for CI * This is not the object you're looking for * Correct artifact id * prefer integrations for versions (SNAPSHOTs) * Use direct snapshot version * Update kord snapshot name * Fix equality checks between generic emojis * Fix equals() on DiscordEmoji (#8) * Fix equals() on DiscordEmoji - Make extensions extend MessageBehavior instead of Message * I literally didn't realize that Generic wasn't a data class * Apply requested changes Co-authored-by: Bart Arys <[email protected]> * Kord 0.7.0 (#10) * Update dependencies * Update publishing Co-authored-by: Jake Mattson <[email protected]> Co-authored-by: BartArys <[email protected]> Co-authored-by: Bart Arys <[email protected]> Co-authored-by: Michael Rittmeister <[email protected]>
kordlib · Jun 21, 2021 · d3ff9fa · d3ff9fa
1 parent 395c751
commit d3ff9fa
Show file tree

Hide file tree

Showing 16 changed files with 2,292 additions and 2,229 deletions.
diff --git a/.github/workflows/deployment-ci.yml b/.github/workflows/deployment-ci.yml
@@ -1,28 +1,73 @@
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java#publishing-using-gradle
+# This workflow will build a package using Gradle and then publish it to maven
+
+name: Kotlin CI
 
-name: Deployment
 on:
+  push:
+    branches:
+      - '**' # We want to run this on all branch pushes
+    tags-ignore:
+      - '**' # We don't want this to run on tags pushes
+  pull_request:
   release:
-    types: [created]
-
+    types: [ published ]
 jobs:
-  deloy:
-
+  build:
+    name: Build Kord
     runs-on: ubuntu-latest
     env:
-      KORD_TEST_TOKEN: ${{ secrets.KORD_TEST_TOKEN }}
-      GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-      BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
-      BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     steps:
       - uses: actions/checkout@v2
-      - run: echo ::set-env name=RELEASE_TAG::${GITHUB_REF#refs/tags/}
-      - name: Set up JDK 1.14
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Set up JDK 8
         uses: actions/setup-java@v1
         with:
-          java-version: 1.14
-
+          java-version: 8
       - name: Build with Gradle
-        run: gradle --stacktrace --info bintrayUpload
+        run: ./gradlew --stacktrace --info build
+        if: |
+          !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]')
+
+  release:
+    name: Publish artifacts
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    needs: build
+    env:
+      NEXUS_USER: ${{ secrets.NEXUS_USER }}
+      NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+      ORG_GRADLE_PROJECT_signingKey: ${{ secrets.signingKey }}
+      ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.signingPassword }}
+      GITHUB_EVENT_NAME: ${{ github.event_name }}
+      GITHUB_TAG_NAME: ${{ github.event.release.tag_name }}
+      GITHUB_TARGET_COMMITISH: ${{ github.event.release.target_commitish }}
+      GITHUB_BRANCH_NAME: ${{ github.ref }}
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Set up JDK 8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Publish with Gradle
+        run: ./gradlew -x test publish
+# Disabled for now
+#
+#      - name: Close and Release Repository
+#          run: ./gradlew closeAndReleaseRepository
diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,3 +1,14 @@
+# 0.5.0
+
+## Dependencies
+
+* kord: 0.6.x -> 0.7.0
+* kotlin: 1.4.10 -> 1.5.10
+
+## Fixes
+
+* Fixed equality checks between generic emojis.
+
 # 0.4.0
 
 ## Additions
@@ -12,8 +23,8 @@
 
 ## Dependencies
 
-kord: 0.5.x -> 0.6.x
-kotlin: 1.3.72 -> 1.4.10
+* kord: 0.5.x -> 0.6.x
+* kotlin: 1.3.72 -> 1.4.10
 
 # 0.2.0
 

diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # kordx.emoji
 
 [![Discord](https://img.shields.io/discord/556525343595298817.svg?color=&label=Kord&logo=discord&style=for-the-badge)](https://discord.gg/6jcx5ev)
-[ ![Download](https://img.shields.io/bintray/v/kordlib/Kord/kordx.emoji?color=&style=for-the-badge) ](https://bintray.com/kordlib/Kord/kordx.emoji/_latestVersion)
 
 An extension library that adds a list of supported emojis to Kord.
 
@@ -16,36 +15,27 @@ suspend fun MessageCreateEvent.handle() {
 ```
 
 ## Installation
+Replace `{version}` with the desired version number.
 
-Replace `{version}` with the latest version number on bintray. [ ![Download](https://img.shields.io/bintray/v/kordlib/Kord/kordx.emoji?color=&style=for-the-badge) ](https://bintray.com/kordlib/Kord/kordx.emoji/_latestVersion)
-
-### Gradle
-
-```kotlin
-repositories {
- maven(url = "https://dl.bintray.com/kordlib/Kord")
+### Gradle (groovy)
+```groovy
+dependencies {
+    implementation 'dev.kord:kordx.emoji:{version}'
 }
 ```
 
+### Gradle (kotlin)
 ```kotlin
-dependencies {
-    implementation("com.gitlab.kordlib:kordx.emoji:{version}")
+dependencies { 
+    implementation("dev.kord:kordx.emoji:{version}")
 }
 ```
 
 ### Maven
-
-```xml
-<repository>
-    <id>bintray</id>
-    <url>https://dl.bintray.com/kordlib/Kord</url>
-</repository>
-```
-
 ```xml
 <dependency>
-    <groupId>com.gitlab.kordlib</groupId>
+    <groupId>dev.kord</groupId>
     <artifactId>kordx.emoji</artifactId>
     <version>{version}</version>
 </dependency>
-```
+```