Skip to content
This repository was archived by the owner on Dec 28, 2024. It is now read-only.

Commit 3d3c6de

Browse files
jchamlinjchamlin
committed
Converted from maven to gradle and fixed to work with Java 14, Gradle 6.5.1, and Eclipse 2020-06-R
1 parent 7f1bc70 commit 3d3c6de

File tree

17 files changed

+159
-129
lines changed

17 files changed

+159
-129
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
# Ignore Eclipse stuff
12
.metadata
23
target
34
bin
45
.settings
6+
7+
# Ignore Gradle stuff
8+
.gradle
9+
build

‎.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>clipper-java</name>
4+
<comment>Project clipper-java created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

‎Clipper Console/.classpath‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry kind="src" output="bin/main" path="src">
44
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
10-
<attributes>
11-
<attribute name="maven.pomderived" value="true"/>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
127
</attributes>
138
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
10+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
1411
<classpathentry combineaccessrules="false" kind="src" path="/Clipper"/>
15-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry kind="output" path="target/classes"/>
12+
<classpathentry kind="output" path="bin/default"/>
2113
</classpath>

‎Clipper Console/.project‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>Clipper Console</name>
3+
<name>ClipperConsole</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -11,13 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2120
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
2222
</natures>
2323
</projectDescription>

‎Clipper Console/build.gradle‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
group = "de.lighti"
6+
version = "6.4.2"
7+
description = "A command line tool to read and process polygon files."
8+
9+
dependencies {
10+
compile project(':Clipper');
11+
}
12+
13+
java {
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
16+
}
17+
18+
jar {
19+
manifest {
20+
attributes 'Implementation-Title': project.name,
21+
'Implementation-Version': project.version
22+
}
23+
}
24+
25+
sourceSets {
26+
main {
27+
java {
28+
srcDirs 'src'
29+
}
30+
}
31+
}
32+
33+
tasks.withType(JavaCompile) {
34+
options.compilerArgs << '-Xlint:unchecked'
35+
options.deprecation = true
36+
}

‎Clipper Console/pom.xml‎

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

‎Clipper GUI/.classpath‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src">
3+
<classpathentry kind="src" output="bin/main" path="src">
44
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
10-
<attributes>
11-
<attribute name="maven.pomderived" value="true"/>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
127
</attributes>
138
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
10+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
1411
<classpathentry combineaccessrules="false" kind="src" path="/Clipper"/>
15-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry kind="output" path="target/classes"/>
12+
<classpathentry kind="output" path="bin/default"/>
2113
</classpath>

‎Clipper GUI/.project‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>Clipper GUI</name>
3+
<name>ClipperGUI</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -11,13 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.m2e.core.maven2Builder</name>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
20-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2120
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
2222
</natures>
2323
</projectDescription>

‎Clipper GUI/build.gradle‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
group = "de.lighti"
6+
version = "6.4.2"
7+
description = "A swing-based application to visualize the various operations of the Clipper library."
8+
9+
dependencies {
10+
compile project(':Clipper');
11+
}
12+
13+
java {
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
16+
}
17+
18+
jar {
19+
manifest {
20+
attributes 'Implementation-Title': project.name,
21+
'Implementation-Version': project.version
22+
}
23+
}
24+
25+
sourceSets {
26+
main {
27+
java {
28+
srcDirs 'src'
29+
}
30+
}
31+
}
32+
33+
tasks.withType(JavaCompile) {
34+
options.compilerArgs << '-Xlint:unchecked'
35+
options.deprecation = true
36+
}

‎Clipper GUI/pom.xml‎

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

0 commit comments

Comments
 (0)