Skip to content

Commit e1600c8

Browse files
committed
feat: removed dist-minimal.
1 parent d8d7459 commit e1600c8

File tree

6 files changed

+50
-73
lines changed

6 files changed

+50
-73
lines changed

buildSrc/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
plugins {
22
id 'groovy-gradle-plugin'
3-
}
4-
5-
repositories {
6-
mavenCentral()
7-
}
8-
9-
dependencies {
10-
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.1.0")
113
}

buildSrc/src/main/groovy/java-dist-conv.gradle

Lines changed: 0 additions & 34 deletions
This file was deleted.

dist-minimal/build.gradle

Lines changed: 0 additions & 17 deletions
This file was deleted.

dist/build.gradle

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,56 @@
11
plugins {
2-
id 'java-dist-conv'
2+
id 'java-conv'
3+
id 'com.gradleup.shadow' version '9.0.0-rc3'
4+
id 'application'
35
}
46

57
description = 'GumTree distribution.'
68

79
dependencies {
8-
implementation project(':core')
9-
implementation project(':client')
10-
implementation project(':client.diff')
11-
implementation project(':gen.css')
12-
implementation project(':gen.javaparser')
13-
implementation project(':gen.jdt')
14-
implementation project(':gen.js')
15-
implementation project(':gen.srcml')
16-
implementation project(':gen.treesitter-ng')
17-
implementation project(':gen.xml')
18-
implementation project(':gen.yaml')
10+
implementation project(':core')
11+
implementation project(':client')
12+
implementation project(':client.diff')
13+
implementation project(':gen.css')
14+
implementation project(':gen.javaparser')
15+
implementation project(':gen.jdt')
16+
implementation project(':gen.js')
17+
implementation project(':gen.srcml')
18+
implementation project(':gen.treesitter-ng')
19+
implementation project(':gen.xml')
20+
implementation project(':gen.yaml')
1921
}
22+
23+
shadowJar {
24+
archiveBaseName.set('gumtree')
25+
archiveClassifier.set('')
26+
archiveVersion.set('')
27+
mergeServiceFiles()
28+
mergeServiceFiles {
29+
path = 'META-INF/annotations'
30+
}
31+
}
32+
33+
distributions {
34+
shadow {
35+
distributionBaseName = 'gumtree'
36+
}
37+
}
38+
39+
application {
40+
mainClass = 'com.github.gumtreediff.client.Run'
41+
applicationName = 'gumtree'
42+
}
43+
44+
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
45+
archiveBaseName.set('gumtree')
46+
}
47+
48+
shadowDistZip.enabled = true
49+
distTar.enabled = false
50+
distZip.enabled = false
51+
startScripts.enabled = false
52+
shadowDistTar.enabled = false
53+
54+
jar.enabled = false
55+
56+
build.finalizedBy installShadowDist

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ENV TZ=GMT
2828
ENV LANG=C.UTF-8
2929

3030
# Copy gumtree distribution from build-stage.
31-
COPY --from=build-stage /opt/gumtree/dist/build/install/dist-shadow/ /opt/gumtree
31+
COPY --from=build-stage /opt/gumtree/dist/build/install/gumtree/ /opt/gumtree
3232
# Copy srcml package from build-stage.
3333
COPY --from=build-stage /*.deb /opt
3434

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include 'benchmark',
33
'client.diff',
44
'core',
55
'dist',
6-
'dist-minimal',
76
'gen.antlr3',
87
'gen.antlr4',
98
'gen.css',

0 commit comments

Comments
 (0)