Skip to content

Commit 32b473b

Browse files
committedNov 25, 2024··
fix: deprecations
1 parent 76f4b7e commit 32b473b

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed
 

‎build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ plugins {
1010
alias(libs.plugins.kotlin) // Kotlin support
1111
alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
1212
alias(libs.plugins.changelog) // Gradle Changelog Plugin
13-
alias(libs.plugins.qodana) // Gradle Qodana Plugin
1413
alias(libs.plugins.kover) // Gradle Kover Plugin
1514
}
1615

@@ -49,6 +48,9 @@ dependencies {
4948
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
5049
plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
5150

51+
// Workaround Intelij Gradle Bug
52+
bundledModule("intellij.platform.vcs.dvcs.impl")
53+
5254
instrumentationTools()
5355
pluginVerifier()
5456
zipSigner()

‎gradle/libs.versions.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ junit = "4.13.2"
44

55
# plugins
66
changelog = "2.2.1"
7-
intelliJPlatform = "2.0.1"
8-
kotlin = "2.0.20"
7+
intelliJPlatform = "2.1.0"
8+
kotlin = "2.0.21"
99
kover = "0.8.3"
10-
qodana = "2024.2.3"
1110

1211
[libraries]
1312
junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -17,4 +16,3 @@ changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
1716
intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" }
1817
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
1918
kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
20-
qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }

‎qodana.yml

-6
This file was deleted.

‎src/main/kotlin/de/shyim/shopware6/installer/ShopwareApiUtil.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.intellij.openapi.application.ApplicationInfo
77
import java.io.BufferedReader
88
import java.io.IOException
99
import java.io.InputStreamReader
10-
import java.net.URL
10+
import java.net.URI
1111
import java.net.URLConnection
1212

1313

@@ -46,7 +46,7 @@ object ShopwareApiUtil {
4646
)
4747

4848
return try {
49-
val url = URL("https://releases.shopware.com/changelog/index.json")
49+
val url = URI("https://api.shopware.com/platform/releases").toURL()
5050
val conn: URLConnection = url.openConnection()
5151
conn.setRequestProperty("User-Agent", userAgent)
5252
conn.connect()

‎src/main/kotlin/de/shyim/shopware6/installer/ShopwareProjectGeneratorPeer.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package de.shyim.shopware6.installer
22

33
import com.intellij.ide.util.projectWizard.SettingsStep
4+
import com.intellij.openapi.ui.TextFieldWithBrowseButton
45
import com.intellij.openapi.ui.ValidationInfo
56
import com.intellij.platform.ProjectGeneratorPeer
67
import de.shyim.shopware6.ui.installer.ShopwareInstallerForm
@@ -9,7 +10,10 @@ import javax.swing.JComponent
910
class ShopwareProjectGeneratorPeer : ProjectGeneratorPeer<ShopwareProjectSettings> {
1011
private var shopwareProjectGenerator: ShopwareInstallerForm = ShopwareInstallerForm()
1112

12-
override fun getComponent(): JComponent {
13+
override fun getComponent(
14+
myLocationField: TextFieldWithBrowseButton,
15+
checkValid: Runnable
16+
): JComponent {
1317
return shopwareProjectGenerator.contentPane
1418
}
1519

0 commit comments

Comments
 (0)
Please sign in to comment.