refactor: update versions and repo urls

theSimpleCloud · Sep 29, 2024 · 26bf92d · 26bf92d
1 parent 50ada35
commit 26bf92d
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,7 @@ allprojects {
         }
 
         maven {
-            url "https://repo.thesimplecloud.eu/artifactory/gradle-release-local/"
+            url "https://repo.simplecloud.app/releases/"
         }
 
         maven {

diff --git a/simplecloud-base/src/main/resources/manager.json b/simplecloud-base/src/main/resources/manager.json
@@ -4,7 +4,6 @@
   "mainClass": "eu.thesimplecloud.base.manager.startup.Manager",
   "moduleCopyType": "NONE",
   "repositories": [
-    "https://repo.thesimplecloud.eu/artifactory/gradle-dev/",
     "https://repo.maven.apache.org/maven2/"
   ],
   "dependencies": [

diff --git a/simplecloud-base/src/main/resources/wrapper.json b/simplecloud-base/src/main/resources/wrapper.json
@@ -4,7 +4,6 @@
   "mainClass": "eu.thesimplecloud.base.wrapper.startup.Wrapper",
   "moduleCopyType": "NONE",
   "repositories": [
-    "https://repo.thesimplecloud.eu/artifactory/gradle-dev/",
     "https://repo.maven.apache.org/maven2/"
   ],
   "dependencies": [

diff --git a/...cy-loader/src/main/kotlin/eu/thesimplecloud/loader/dependency/LauncherDependencyLoader.kt b/...cy-loader/src/main/kotlin/eu/thesimplecloud/loader/dependency/LauncherDependencyLoader.kt
@@ -33,7 +33,7 @@ class LauncherDependencyLoader {
         return dependencyLoader.loadDependencies(
             listOf(
                 "https://repo.maven.apache.org/maven2/",
-                "https://repo.thesimplecloud.eu/artifactory/gradle-release-local/"
+                "https://repo.simplecloud.app/releases/"
             ),
             listOf(
                 AdvancedCloudDependency("eu.thesimplecloud.clientserverapi", "clientserverapi", "4.1.18"),

diff --git a/simplecloud-launcher/src/main/kotlin/eu/thesimplecloud/launcher/updater/IUpdater.kt b/simplecloud-launcher/src/main/kotlin/eu/thesimplecloud/launcher/updater/IUpdater.kt
@@ -64,9 +64,9 @@ interface IUpdater {
      */
     fun getRepositoryURL(): String {
         return if (Launcher.instance.isSnapshotBuild()) {
-            "https://repo.thesimplecloud.eu/artifactory/list/gradle-dev-local/"
+            "https://repo.simplecloud.app/snapshots/"
         } else {
-            "https://repo.thesimplecloud.eu/artifactory/list/gradle-release-local/"
+            "https://repo.simplecloud.app/releases/"
         }
     }
 

diff --git a/simplecloud-launcher/src/main/kotlin/eu/thesimplecloud/launcher/updater/RunnerUpdater.kt b/simplecloud-launcher/src/main/kotlin/eu/thesimplecloud/launcher/updater/RunnerUpdater.kt
@@ -51,6 +51,7 @@ class RunnerUpdater(
 
     override fun getVersionToInstall(): String? {
         if (versionToInstall != null) return versionToInstall
+        //TODO update to new url
         val urlstring =
             "https://update.thesimplecloud.eu/latestVersion/${getCurrentVersion()}?channel=${updateChannel.toChannelString()}"
         val content =

diff --git a/simplecloud-modules/simplecloud-module-chat-tab/build.gradle b/simplecloud-modules/simplecloud-module-chat-tab/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     compileOnly(project(":simplecloud-launcher"))
     compileOnly(project(":simplecloud-modules:simplecloud-module-permission"))
     compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
     compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT'
     // The full Spigot server with no shadowing. Requires mavenLocal.
     // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind

diff --git a/simplecloud-modules/simplecloud-module-hubcommand/build.gradle b/simplecloud-modules/simplecloud-module-hubcommand/build.gradle
@@ -28,5 +28,5 @@ dependencies {
     compileOnly(project(":simplecloud-base"))
     compileOnly(project(":simplecloud-api"))
     compileOnly(project(":simplecloud-launcher"))
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
 }
diff --git a/simplecloud-modules/simplecloud-module-permission/build.gradle b/simplecloud-modules/simplecloud-module-permission/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     compileOnly(project(":simplecloud-launcher"))
     compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6.1'
 
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
     // The full Spigot server with no shadowing. Requires mavenLocal.
     compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT'
     // The full Spigot server with no shadowing. Requires mavenLocal.

diff --git a/simplecloud-modules/simplecloud-module-placeholders/build.gradle b/simplecloud-modules/simplecloud-module-placeholders/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     compileOnly(project(":simplecloud-modules:simplecloud-module-chat-tab"))
 
     compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
 
     compileOnly 'com.github.placeholderapi:placeholderapi:2.11.6'
 

diff --git a/simplecloud-modules/simplecloud-module-serviceselection/build.gradle b/simplecloud-modules/simplecloud-module-serviceselection/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testApi(project(":simplecloud-api"))
 
 
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
     testApi group: 'commons-io', name: 'commons-io', version: dependencyCommonsIOVersion
     testApi group: 'com.google.guava', name: 'guava', version: dependencyGuavaVersion
     testApi group: 'io.netty', name: 'netty-all', version: dependencyNettyVersion

diff --git a/simplecloud-modules/simplecloud-module-sign/build.gradle b/simplecloud-modules/simplecloud-module-sign/build.gradle
@@ -20,7 +20,7 @@ dependencies {
         transitive = false
     }
 
-    compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
     compileOnly(group: 'commons-io', name: 'commons-io', version: dependencyCommonsIOVersion)
 
 }
diff --git a/simplecloud-plugin/build.gradle b/simplecloud-plugin/build.gradle
@@ -22,13 +22,13 @@
 
 dependencies {
     compileOnly group: 'org.reflections', name: 'reflections', version: '0.10.2'
-    compileOnly(group: 'io.netty', name: 'netty-all', version: '4.1.100.Final')
+    compileOnly(group: 'io.netty', name: 'netty-all', version: dependencyNettyVersion)
     api(group: 'eu.thesimplecloud.clientserverapi', name: 'clientserverapi', version: depedencyClientServerAPIVersion)
     api(group: 'eu.thesimplecloud.jsonlib', name: 'json-lib', version: "1.0.8")
     api(project(":simplecloud-api"))
 
     api(project(":simplecloud-client"))
-    compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
     compileOnly 'net.md-5:bungeecord-api:1.17-R0.1-SNAPSHOT'
     compileOnly 'com.velocitypowered:velocity-api:3.1.1'
     annotationProcessor 'com.velocitypowered:velocity-api:3.1.1'

diff --git a/simplecloud-runner/src/main/kotlin/eu/thesimplecloud/runner/RunnerClassLoaderInitMain.kt b/simplecloud-runner/src/main/kotlin/eu/thesimplecloud/runner/RunnerClassLoaderInitMain.kt
@@ -60,14 +60,14 @@ fun main(args: Array<String>) {
 
         if (!copiedSimpleCloudPluginFile.exists()) {
             Downloader().userAgentDownload(
-                "https://repo.thesimplecloud.eu/artifactory/gradle-release-local/eu/thesimplecloud/simplecloud/simplecloud-plugin/$version/simplecloud-plugin-$version-all.jar",
+                "https://repo.simplecloud.app/releases/eu/thesimplecloud/simplecloud/simplecloud-plugin/$version/simplecloud-plugin-$version-all.jar",
                 copiedSimpleCloudPluginFile
             )
         }
 
         if (!copiedLauncherFile.exists())
             Downloader().userAgentDownload(
-                "https://repo.thesimplecloud.eu/artifactory/gradle-release-local/eu/thesimplecloud/simplecloud/simplecloud-launcher/$version/simplecloud-launcher-$version-all.jar",
+                "https://repo.simplecloud.app/releases/eu/thesimplecloud/simplecloud/simplecloud-launcher/$version/simplecloud-launcher-$version-all.jar",
                 copiedLauncherFile
             )
     }
@@ -97,7 +97,7 @@ private fun getCloudVersion(): String {
 
 private fun downloadJarFromDependency(artifactId: String, file: File) {
     val dependency = AdvancedCloudDependency("eu.thesimplecloud.simplecloud", artifactId, getCloudVersion())
-    dependency.download("https://repo.thesimplecloud.eu/artifactory/gradle-release-local/", file)
+    dependency.download("https://repo.simplecloud.app/releases/", file)
 }
 
 private fun executeDependencyLoaderMain(classLoader: URLClassLoader, args: Array<String>) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ allprojects { @@
             }
             maven {
-                url "https://repo.thesimplecloud.eu/artifactory/gradle-release-local/"
+                url "https://repo.simplecloud.app/releases/"
             }
             maven {
@@ Expand Down @@