Skip to content

Commit 75d3a88

Browse files
na-ka-nana-ka-na
authored
Merge pull request #63 from dannyagostinelli/gradleBuild
Converting project to be built with gradle
2 parents 93869f6 + b849d05 commit 75d3a88

File tree

76 files changed

+70
-248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+70
-248
lines changed

‎.classpath

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="test"/>
5-
<classpathentry kind="lib" path="lib/ivy/jar/stax-api-1.0.1.jar"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7-
<classpathentry kind="lib" path="lib/ivy/jar/jsr305-2.0.2.jar"/>
8-
<classpathentry kind="lib" path="lib/ivy/jar/commons-beanutils-1.8.3.jar"/>
9-
<classpathentry kind="lib" path="lib/ivy/jar/commons-digester-1.8.jar"/>
10-
<classpathentry kind="lib" path="lib/ivy/jar/commons-logging-1.1.1.jar"/>
11-
<classpathentry kind="lib" path="lib/ivy/jar/commons-validator-1.4.0.jar"/>
12-
<classpathentry kind="lib" path="lib/ivy/jar/java-rdfa-0.4.2.jar"/>
13-
<classpathentry kind="lib" path="lib/ivy/jar/jena-core-2.7.4.jar"/>
14-
<classpathentry kind="lib" path="lib/ivy/jar/jena-iri-0.9.4.jar"/>
15-
<classpathentry kind="lib" path="lib/ivy/jar/odfdom-java-0.8.10-incubating.jar"/>
16-
<classpathentry kind="lib" path="lib/ivy/jar/simple-odf-0.8.1-incubating.jar" sourcepath="lib/ivy/source/simple-odf-0.8.1-incubating.jar">
3+
<classpathentry kind="src" output="bin/main" path="src/main/java">
174
<attributes>
18-
<attribute name="javadoc_location" value="jar:platform:/resource/ExcelCompare/lib/ivy/javadoc/simple-odf-0.8.1-incubating.jar!/"/>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
197
</attributes>
208
</classpathentry>
21-
<classpathentry kind="lib" path="lib/ivy/jar/slf4j-api-1.6.4.jar"/>
22-
<classpathentry kind="lib" path="lib/ivy/jar/slf4j-log4j12-1.6.4.jar"/>
23-
<classpathentry kind="lib" path="lib/ivy/jar/taglets-0.8.10-incubating.jar"/>
24-
<classpathentry kind="lib" path="lib/ivy/jar/xercesImpl-2.9.1.jar"/>
25-
<classpathentry kind="lib" path="lib/ivy/jar/xml-apis-1.3.04.jar"/>
26-
<classpathentry kind="lib" path="lib/ivy/jar/poi-3.12.jar" sourcepath="lib/ivy/source/poi-ooxml-3.12.jar"/>
27-
<classpathentry kind="lib" path="lib/ivy/jar/poi-ooxml-3.12.jar"/>
28-
<classpathentry kind="lib" path="lib/ivy/jar/poi-ooxml-schemas-3.12.jar"/>
29-
<classpathentry kind="lib" path="lib/ivy/jar/xmlbeans-2.6.0.jar"/>
30-
<classpathentry kind="output" path="bin"/>
9+
<classpathentry kind="src" output="bin/main" path="src/main/resources">
10+
<attributes>
11+
<attribute name="gradle_scope" value="main"/>
12+
<attribute name="gradle_used_by_scope" value="main,test"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="src" output="bin/test" path="src/test/resources">
16+
<attributes>
17+
<attribute name="gradle_scope" value="test"/>
18+
<attribute name="gradle_used_by_scope" value="test"/>
19+
<attribute name="test" value="true"/>
20+
</attributes>
21+
</classpathentry>
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/"/>
23+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
24+
<classpathentry kind="output" path="bin/default"/>
3125
</classpath>

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ bin
33
classes
44
install_stage
55
ivy
6-
ExcelCompare*.zip
6+
ExcelCompare*.zip
7+
build
8+
.gradle

‎.project

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>ExcelCompare</name>
3+
<name>spreadsheet.diff</name>
44
<comment></comment>
55
<projects>
66
</projects>
@@ -10,8 +10,25 @@
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
1318
</buildSpec>
1419
<natures>
1520
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1622
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>0</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
1734
</projectDescription>

‎BUILDING

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
Release
22
-------
3-
# Note: set jdk to <= 6 before following
4-
# On Mac install jdk6 from https://support.apple.com/kb/DL1572, then export JAVA_HOME=$(/usr/libexec/java_home -v 1.6)
5-
# Install ant with ivy, or mkdir ivy/, download ivy.jar into ivy/
6-
# ant deps
7-
# Inc version in cfg/build.properties
8-
> ant clean test
9-
> ant clean build
10-
# This will create the release zip
11-
# Upload relase to github
12-
# Update brew formula https://github.com/Homebrew/homebrew-core/blob/master/Formula/excel-compare.rb
3+
Install Visual Studio Code with Gradle extension
4+
Change version in build.gradle file
5+
Run "gradle distZip" command in trerminal or select "distZip" under Tasks->distribution commands to get the Release zip file. Zip file will be in build/distributions folder.
6+
Upload release to github

‎build.gradle

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
repositories {
2+
mavenCentral()
3+
}
4+
5+
allprojects {
6+
group 'com.ka'
7+
version '0.7.0'
8+
}
9+
10+
apply plugin: "java"
11+
apply plugin: "application"
12+
13+
sourceCompatibility = 1.6
14+
15+
distributions {
16+
main {
17+
mainClassName = "com.ka.spreadsheet.diff.SpreadSheetDiffer"
18+
}
19+
}
20+
21+
dependencies {
22+
implementation("org.apache.poi:poi-ooxml:3.12")
23+
implementation("org.apache.odftoolkit:simple-odf:0.8.1-incubating")
24+
implementation("com.google.code.findbugs:jsr305:3.0.1")
25+
}

‎build.xml

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

‎ivy.xml

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

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = 'spreadsheet.diff'

‎src/com/ka/spreadsheet/diff/CellPos.java renamed to ‎src/main/java/com/ka/spreadsheet/diff/CellPos.java

File renamed without changes.

‎src/com/ka/spreadsheet/diff/CellValue.java renamed to ‎src/main/java/com/ka/spreadsheet/diff/CellValue.java

File renamed without changes.

0 commit comments

Comments
 (0)