fix: deprecations

shopwareLabs · Nov 25, 2024 · 32b473b · 32b473b
1 parent 76f4b7e
commit 32b473b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     alias(libs.plugins.kotlin) // Kotlin support
     alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
     alias(libs.plugins.changelog) // Gradle Changelog Plugin
-    alias(libs.plugins.qodana) // Gradle Qodana Plugin
     alias(libs.plugins.kover) // Gradle Kover Plugin
 }
 
@@ -49,6 +48,9 @@ dependencies {
         // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
         plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
 
+        // Workaround Intelij Gradle Bug
+        bundledModule("intellij.platform.vcs.dvcs.impl")
+
         instrumentationTools()
         pluginVerifier()
         zipSigner()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,10 +4,9 @@ junit = "4.13.2"
 
 # plugins
 changelog = "2.2.1"
-intelliJPlatform = "2.0.1"
-kotlin = "2.0.20"
+intelliJPlatform = "2.1.0"
+kotlin = "2.0.21"
 kover = "0.8.3"
-qodana = "2024.2.3"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -17,4 +16,3 @@ changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
 intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
-qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
diff --git a/qodana.yml b/qodana.yml
diff --git a/src/main/kotlin/de/shyim/shopware6/installer/ShopwareApiUtil.kt b/src/main/kotlin/de/shyim/shopware6/installer/ShopwareApiUtil.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.application.ApplicationInfo
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
-import java.net.URL
+import java.net.URI
 import java.net.URLConnection
 
 
@@ -46,7 +46,7 @@ object ShopwareApiUtil {
         )
 
         return try {
-            val url = URL("https://releases.shopware.com/changelog/index.json")
+            val url = URI("https://api.shopware.com/platform/releases").toURL()
             val conn: URLConnection = url.openConnection()
             conn.setRequestProperty("User-Agent", userAgent)
             conn.connect()

diff --git a/src/main/kotlin/de/shyim/shopware6/installer/ShopwareProjectGeneratorPeer.kt b/src/main/kotlin/de/shyim/shopware6/installer/ShopwareProjectGeneratorPeer.kt
@@ -1,6 +1,7 @@
 package de.shyim.shopware6.installer
 
 import com.intellij.ide.util.projectWizard.SettingsStep
+import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.platform.ProjectGeneratorPeer
 import de.shyim.shopware6.ui.installer.ShopwareInstallerForm
@@ -9,7 +10,10 @@ import javax.swing.JComponent
 class ShopwareProjectGeneratorPeer : ProjectGeneratorPeer<ShopwareProjectSettings> {
     private var shopwareProjectGenerator: ShopwareInstallerForm = ShopwareInstallerForm()
 
-    override fun getComponent(): JComponent {
+    override fun getComponent(
+        myLocationField: TextFieldWithBrowseButton,
+        checkValid: Runnable
+    ): JComponent {
         return shopwareProjectGenerator.contentPane
     }