Skip to content

Commit 77ab8ef

Browse files
refactor: use JetBrains release repository for FernFlower decompiler package
1 parent b7bc79a commit 77ab8ef

File tree

7 files changed

+9
-126
lines changed

7 files changed

+9
-126
lines changed

gradle/libs.versions.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ lsp4jVersion = "0.21.2"
44
exposedVersion = "0.37.3"
55
jmhVersion = "1.37"
66
guavaVersion = "33.4.0-jre"
7+
fernFlowerVersion = "243.22562.218"
78

89
[libraries]
910
org-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinVersion" }
@@ -28,7 +29,7 @@ org-jetbrains-exposed-core = { module = "org.jetbrains.exposed:exposed-core", ve
2829
org-jetbrains-exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposedVersion" }
2930
org-jetbrains-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposedVersion" }
3031

31-
org-jetbrains-fernflower = { module = "org.jetbrains:fernflower", version = "1.0" }
32+
com-jetbrains-intellij-java-decompiler = { module = "com.jetbrains.intellij.java:java-decompiler-engine", version.ref = "fernFlowerVersion" }
3233

3334
com-github-fwcd-ktfmt = { module = "com.github.fwcd.ktfmt:ktfmt", version = "b5d31d1" }
3435

platform/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
api(libs.org.jetbrains.kotlin.sam.with.receiver.compiler.plugin)
1616
api(libs.org.jetbrains.kotlin.reflect)
1717
api(libs.org.jetbrains.kotlin.jvm)
18-
api(libs.org.jetbrains.fernflower)
18+
api(libs.com.jetbrains.intellij.java.decompiler)
1919
api(libs.org.jetbrains.exposed.core)
2020
api(libs.org.jetbrains.exposed.dao)
2121
api(libs.org.jetbrains.exposed.jdbc)

server/build.gradle.kts

+6-9
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ application {
1919
mainClass.set(serverMainClassName)
2020
description = "Code completions, diagnostics and more for Kotlin"
2121
applicationDefaultJvmArgs = listOf("-DkotlinLanguageServer.version=$version")
22-
applicationDistribution.into("bin") {
23-
filePermissions { unix("755".toInt(radix = 8)) }
24-
}
22+
applicationDistribution.into("bin") { filePermissions { unix("755".toInt(radix = 8)) } }
2523
}
2624

2725
repositories {
2826
maven(url = "https://repo.gradle.org/gradle/libs-releases")
29-
maven { url = uri("$projectDir/lib") }
30-
maven(uri("$projectDir/lib"))
3127
maven("https://jitpack.io")
28+
maven(url = "https://www.jetbrains.com/intellij-repository/releases")
3229
mavenCentral()
3330
}
3431

@@ -48,7 +45,7 @@ dependencies {
4845
implementation(kotlin("scripting-jvm-host-unshaded"))
4946
implementation(kotlin("sam-with-receiver-compiler-plugin"))
5047
implementation(kotlin("reflect"))
51-
implementation(libs.org.jetbrains.fernflower)
48+
implementation(libs.com.jetbrains.intellij.java.decompiler)
5249
implementation(libs.org.jetbrains.exposed.core)
5350
implementation(libs.org.jetbrains.exposed.dao)
5451
implementation(libs.org.jetbrains.exposed.jdbc)
@@ -79,9 +76,9 @@ tasks.register<Exec>("fixFilePermissions") {
7976

8077
onlyIf { !System.getProperty("os.name").lowercase().contains("windows") }
8178
commandLine(
82-
"chmod",
83-
"+x",
84-
"${tasks.installDist.get().destinationDir}/bin/kotlin-language-server"
79+
"chmod",
80+
"+x",
81+
"${tasks.installDist.get().destinationDir}/bin/kotlin-language-server",
8582
)
8683
}
8784

server/lib/fernflower-license.txt

-11
This file was deleted.

server/lib/gradle-kotlin-dsl-tooling-models-0.11.0-license.txt

-85
This file was deleted.
Binary file not shown.

server/lib/org/jetbrains/fernflower/1.0/fernflower-1.0.pom

-19
This file was deleted.

0 commit comments

Comments
 (0)