Migrate Project

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: Docker
+
+on:
+  push:
+    branches: [ "main" ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@v3.0.5
+        with:
+          cosign-release: 'v1.13.1'
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2.5.0
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4.4.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      - name: Sign the published Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          COSIGN_EXPERIMENTAL: "true"
+        run: echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign {}@${{ steps.build-and-push.outputs.digest }}

.gitignore

@@ -0,0 +1,58 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+.idea/artifacts/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+**/.test-env
+
+# Windows app
+wix311/
+local.properties
+# iOS App
+.externalNativeBuild
+.cxx
+app/ios/Podfile.lock
+app/ios/Pods/*
+app/ios/iosApp.xcworkspace/*
+app/ios/iosApp.xcodeproj/*
+!app/ios/iosApp.xcodeproj/project.pbxproj
+app/ios/ios.podspec

Dockerfile

@@ -1,13 +1,13 @@
-FROM gradle:jdk18 as builder
+FROM gradle:jdk19 as builder
 WORKDIR /usr/app
 COPY . .
-RUN gradle --no-daemon :votebot:plugin:installVoteBotArchive
+RUN gradle --no-daemon :plugin:installBot
 
-FROM ibm-semeru-runtimes:open-18-jre-focal
+FROM ibm-semeru-runtimes:open-19-jre-focal
 
 LABEL org.opencontainers.image.source = "https://github.com/DRSchlaubi/mikbot"
 
 WORKDIR /usr/app
-COPY --from=builder /usr/app/votebot/plugin/build/installVoteBot .
+COPY --from=builder /usr/app/plugin/build/installVoteBot .
 
 ENTRYPOINT ["/usr/app/bin/mikmusic"]

build.gradle.kts

@@ -1,11 +1,22 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+
 plugins {
-    `mikbot-bot`
+    alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
 }
+allprojects {
+    version = "5.1.0"
+    group = "space.votebot"
 
-val versionString = "3.24.0" // version marker
-
-version = versionString
+    repositories {
+        mavenCentral()
+    }
+}
 
 subprojects {
-    version = versionString
+    afterEvaluate {
+        configure<KotlinTopLevelExtension> {
+            jvmToolchain(19)
+        }
+    }
 }

chart-service-client/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `mikbot-module`
+    kotlin("jvm")
     kotlin("plugin.serialization")
 }
 

chart-service-client/src/main/kotlin/space/votebot/pie_char_service/client/PieChartCreateRequest.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 /**
- * Request to create a pie chart.@
+ * Request to create a pie chart.
  *
  * @property title the title of the pie chart
  * @property width the width of the pie chart

common/build.gradle.kts

@@ -6,13 +6,7 @@ plugins {
 kotlin {
     explicitApi()
 
-    jvm {
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "18"
-            }
-        }
-    }
+    jvm()
 //    js(IR) {
 //        nodejs()
 //        browser()

gradle.properties

@@ -0,0 +1 @@
+systemProp.org.gradle.unsafe.kotlin.assignment=true

gradle/libs.versions.toml

@@ -0,0 +1,23 @@
+[versions]
+kotlin = "1.8.22"
+mikbot = "3.19.7"
+ktor = "2.3.1"
+
+[libraries]
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.5.1" }
+ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
+ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.0" }
+
+mikbot-gdpr = { group = "dev.schlaubi", name = "mikbot-gdpr" }
+
+kordex-processor = { group = "com.kotlindiscord.kord.extensions", name = "annotation-processor", version = "1.5.7-SNAPSHOT" }
+java-string-similarity = { group = "info.debatty", name = "java-string-similarity", version = "2.0.0" }
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+mikbot = { id = "dev.schlaubi.mikbot.gradle-plugin", version.ref = "mikbot" }
+ksp = { id = "com.google.devtools.ksp", version = "1.8.22-1.0.11" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "4.1.1"}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists