Skip to content

Commit 40ee167

Browse files
committed
更新gradle, 将依赖打包进jar
1 parent 544cf39 commit 40ee167

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

build.gradle.kts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("java")
3-
kotlin("jvm") version "1.9.22"
4-
id("org.jetbrains.intellij") version "1.17.2"
3+
kotlin("jvm") version "1.9.25"
4+
id("org.jetbrains.intellij") version "1.17.4"
55
id("com.github.johnrengelman.shadow") version "8.1.1"
66
}
77

@@ -15,12 +15,12 @@ repositories {
1515
}
1616

1717
dependencies {
18-
implementation("com.squareup.okhttp3:okhttp:4.12.0")
19-
implementation("org.freemarker:freemarker:2.3.32")
18+
implementation(libs.okhttp)
19+
implementation(libs.freemarker)
2020
}
2121

2222
intellij {
23-
version.set("2023.2.2")
23+
version.set("2024.2.0.2")
2424

2525
plugins.addAll(
2626
"java",
@@ -42,11 +42,19 @@ kotlin {
4242

4343

4444
tasks {
45-
46-
shadowJar {
45+
shadowJar {
4746
archiveClassifier.set("all")
48-
relocate("org.freemarker", "org.tabooproject.intellij.freemarker")
47+
relocate("freemarker", "org.tabooproject.intellij.freemarker")
4948
relocate("okhttp3", "org.tabooproject.intellij.okhttp3")
49+
relocate("okio", "org.tabooproject.intellij.okio")
50+
dependencies {
51+
exclude(dependency("org.jetbrains.kotlin:::"))
52+
exclude(dependency("org.jetbrains:::"))
53+
}
54+
}
55+
56+
build {
57+
dependsOn(shadowJar)
5058
}
5159

5260
patchPluginXml {

gradle/libs.versions.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[versions]
2+
okhttp="4.12.0"
3+
freemarker="2.3.32"
4+
5+
[libraries]
6+
okhttp={ module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
7+
freemarker={module = "org.freemarker:freemarker", version.ref = "freemarker"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)