Migration to Gay Pizza

.github/workflows/publish.yml

@@ -0,0 +1,20 @@
+name: Publish
+on:
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Publish with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publishToGitHubPackages

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Mystic
+Copyright (c) 2023 Gay Pizza Specifications
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,4 +5,4 @@ Concrete is a Gradle plugin for Bukkit projects. Originally spawned out of the G
 ## Contributors
 
 - [@azenla](https://github.com/azenla)
-- [@lgorence](https://github.com/lgorence)
+- [@kubeliv](https://github.com/kubeliv)

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
   `kotlin-dsl`
-  kotlin("plugin.serialization") version "1.6.21"
+  kotlin("plugin.serialization") version "1.7.10"
 
   id("maven-publish")
   id("java-gradle-plugin")
 }
 
-group = "lgbt.mystic.foundation"
+group = "gay.pizza.foundation"
-version = "0.5.0"
+version = "0.6.0-SNAPSHOT"
 
 repositories {
   mavenCentral()
@@ -15,10 +15,10 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-  implementation("org.jetbrains.kotlin:kotlin-serialization:1.6.21")
+  implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.10")
   implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-  implementation("com.google.code.gson:gson:2.10")
+  implementation("com.google.code.gson:gson:2.10.1")
 
   // Implementation of crypto used in smart downloader.
   implementation("org.bouncycastle:bcprov-jdk15on:1.70")
@@ -27,23 +27,23 @@ dependencies {
 gradlePlugin {
   plugins {
     create("concrete-root") {
-      id = "lgbt.mystic.foundation.concrete-root"
+      id = "gay.pizza.foundation.concrete-root"
-      implementationClass = "lgbt.mystic.foundation.concrete.ConcreteRootPlugin"
+      implementationClass = "gay.pizza.foundation.concrete.ConcreteRootPlugin"
     }
 
     create("concrete-base") {
-      id = "lgbt.mystic.foundation.concrete-base"
+      id = "gay.pizza.foundation.concrete-base"
-      implementationClass = "lgbt.mystic.foundation.concrete.ConcreteBasePlugin"
+      implementationClass = "gay.pizza.foundation.concrete.ConcreteBasePlugin"
     }
 
     create("concrete-library") {
-      id = "lgbt.mystic.foundation.concrete-library"
+      id = "gay.pizza.foundation.concrete-library"
-      implementationClass = "lgbt.mystic.foundation.concrete.ConcreteLibraryPlugin"
+      implementationClass = "gay.pizza.foundation.concrete.ConcreteLibraryPlugin"
     }
 
     create("concrete-plugin") {
-      id = "lgbt.mystic.foundation.concrete-plugin"
+      id = "gay.pizza.foundation.concrete-plugin"
-      implementationClass = "lgbt.mystic.foundation.concrete.ConcretePluginPlugin"
+      implementationClass = "gay.pizza.foundation.concrete.ConcretePluginPlugin"
     }
   }
 }
@@ -66,29 +66,16 @@ publishing {
 
     maven {
       name = "github-packages"
-      url = uri("https://maven.pkg.github.com/mysticlgbt/concrete")
+      url = uri("https://maven.pkg.github.com/gaypizzaspecifications/concrete")
       credentials {
-        username = project.findProperty("github.username") as String?
+        username = project.findProperty("github.username") as String? ?: "unknown"
-        password = project.findProperty("github.token") as String?
+        password = project.findProperty("github.token") as String? ?: System.getenv("GITHUB_TOKEN")
-      }
-    }
-
-    maven {
-      name = "gitlab"
-      url = uri("https://gitlab.com/api/v4/projects/37752100/packages/maven")
-      credentials(HttpHeaderCredentials::class.java) {
-        name = "Private-Token"
-        value = project.findProperty("gitlab.com.accessToken") as String?
-      }
-
-      authentication {
-        create<HttpHeaderAuthentication>("header")
       }
     }
   }
 }
 
 tasks.withType<Wrapper> {
-  gradleVersion = "7.5.1"
+  gradleVersion = "7.6"
   distributionType = Wrapper.DistributionType.ALL
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/mixed/bukkit-plugins/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-root")
+  id("gay.pizza.foundation.concrete-root")
 }
 
 concrete {

samples/mixed/bukkit-plugins/common-library/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-library")
+  id("gay.pizza.foundation.concrete-library")
 }

samples/mixed/bukkit-plugins/common-library/src/main/kotlin/gay/pizza/foundation/concrete/sample/common/CommonExtensions.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete.sample.common
+package gay.pizza.foundation.concrete.sample.common
 
 import org.bukkit.plugin.java.JavaPlugin
 

samples/mixed/bukkit-plugins/goodbye-world/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-plugin")
+  id("gay.pizza.foundation.concrete-plugin")
 }
 
 dependencies {

samples/mixed/bukkit-plugins/goodbye-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/goodbyeworld/GoodbyeWorldPlugin.kt

@@ -1,7 +1,7 @@
-package lgbt.mystic.foundation.concrete.sample.goodbyeworld
+package gay.pizza.foundation.concrete.sample.goodbyeworld
 
-import lgbt.mystic.foundation.concrete.sample.common.logOnDisable
+import gay.pizza.foundation.concrete.sample.common.logOnDisable
-import lgbt.mystic.foundation.concrete.sample.common.logOnEnable
+import gay.pizza.foundation.concrete.sample.common.logOnEnable
 import org.bukkit.plugin.java.JavaPlugin
 
 class GoodbyeWorldPlugin : JavaPlugin() {

samples/mixed/bukkit-plugins/goodbye-world/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: GoodbyeWorld
 version: '${version}'
-main: lgbt.mystic.foundation.concrete.sample.goodbyeworld.GoodbyeWorldPlugin
+main: gay.pizza.foundation.concrete.sample.goodbyeworld.GoodbyeWorldPlugin
 api-version: 1.18
 prefix: GoodbyeWorld
 load: STARTUP

samples/mixed/bukkit-plugins/hello-world/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-plugin")
+  id("gay.pizza.foundation.concrete-plugin")
 }
 
 dependencies {

samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt

@@ -0,0 +1,16 @@
+package gay.pizza.foundation.concrete.sample.helloworld
+
+import gay.pizza.foundation.concrete.other.OtherLibrary
+import gay.pizza.foundation.concrete.sample.common.logOnDisable
+import gay.pizza.foundation.concrete.sample.common.logOnEnable
+import org.bukkit.plugin.java.JavaPlugin
+
+class HelloWorldPlugin : JavaPlugin() {
+  override fun onEnable() {
+    logOnEnable(OtherLibrary.HELLO_WORLD)
+  }
+
+  override fun onDisable() {
+    logOnDisable(OtherLibrary.HELLO_WORLD)
+  }
+}

samples/mixed/bukkit-plugins/hello-world/src/main/kotlin/lgbt/mystic/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt

@@ -1,16 +0,0 @@
-package lgbt.mystic.foundation.concrete.sample.helloworld
-
-import lgbt.mystic.foundation.concrete.other.OtherLibrary
-import lgbt.mystic.foundation.concrete.sample.common.logOnDisable
-import lgbt.mystic.foundation.concrete.sample.common.logOnEnable
-import org.bukkit.plugin.java.JavaPlugin
-
-class HelloWorldPlugin : JavaPlugin() {
-  override fun onEnable() {
-    logOnEnable(OtherLibrary.HELLO_WORLD)
-  }
-
-  override fun onDisable() {
-    logOnDisable(OtherLibrary.HELLO_WORLD)
-  }
-}

samples/mixed/bukkit-plugins/hello-world/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: HelloWorld
 version: '${version}'
-main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin
+main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin
 api-version: 1.18
 prefix: HelloWorld
 load: STARTUP

samples/mixed/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/mixed/other-library/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-base")
+  id("gay.pizza.foundation.concrete-base")
 }

samples/mixed/other-library/src/main/java/gay/pizza/foundation/concrete/other/OtherLibrary.java

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete.other;
+package gay.pizza.foundation.concrete.other;
 
 public class OtherLibrary {
     public static final String HELLO_WORLD = "Hello World";

samples/shared/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-root")
+  id("gay.pizza.foundation.concrete-root")
-  id("lgbt.mystic.foundation.concrete-plugin")
+  id("gay.pizza.foundation.concrete-plugin")
 }
 
 concrete {

samples/shared/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/shared/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete.sample.helloworld
+package gay.pizza.foundation.concrete.sample.helloworld
 
 import org.bukkit.plugin.java.JavaPlugin
 

samples/shared/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: HelloWorld
 version: '${version}'
-main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin
+main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin
 api-version: 1.18
 prefix: HelloWorld
 load: STARTUP

samples/simple/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-root")
+  id("gay.pizza.foundation.concrete-root")
 }
 
 concrete {

samples/simple/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/simple/hello-world/build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-  id("lgbt.mystic.foundation.concrete-plugin")
+  id("gay.pizza.foundation.concrete-plugin")
 }

samples/simple/hello-world/src/main/kotlin/gay/pizza/foundation/concrete/sample/helloworld/HelloWorldPlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete.sample.helloworld
+package gay.pizza.foundation.concrete.sample.helloworld
 
 import org.bukkit.plugin.java.JavaPlugin
 

samples/simple/hello-world/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: HelloWorld
 version: '${version}'
-main: lgbt.mystic.foundation.concrete.sample.helloworld.HelloWorldPlugin
+main: gay.pizza.foundation.concrete.sample.helloworld.HelloWorldPlugin
 api-version: 1.18
 prefix: HelloWorld
 load: STARTUP

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBaseBukkitPlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.repositories

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteExtension.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.provider.Property
 

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteLibraryPlugin.kt

@@ -1,3 +1,3 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 class ConcreteLibraryPlugin : ConcreteBaseBukkitPlugin()

src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.get

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

src/main/kotlin/gay/pizza/foundation/concrete/Globals.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import com.google.gson.Gson
 

src/main/kotlin/gay/pizza/foundation/concrete/PaperVersionClient.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import com.google.gson.Gson
 import java.net.URI

src/main/kotlin/gay/pizza/foundation/concrete/RunPaperServer.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input

src/main/kotlin/gay/pizza/foundation/concrete/SetupPaperServer.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input

src/main/kotlin/gay/pizza/foundation/concrete/SmartDownloader.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import java.net.URI
 import java.nio.file.Files

src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction

src/main/kotlin/gay/pizza/foundation/concrete/extensions.kt

@@ -1,4 +1,4 @@
-package lgbt.mystic.foundation.concrete
+package gay.pizza.foundation.concrete
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.Project