Skip to content

Commit

Permalink
Use standard gradle layout
Browse files Browse the repository at this point in the history
The current layout plays havoc with Eclipse integration.

No code changes, just files are moved.
  • Loading branch information
MrCreosote committed Feb 10, 2024
1 parent 8fce168 commit bf4bc0c
Show file tree
Hide file tree
Showing 296 changed files with 2 additions and 105 deletions.
84 changes: 0 additions & 84 deletions .classpath

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Omit the stop key to have jetty generate one for you.
* The master branch is the stable branch. Releases are made from the develop branch to the master
branch.
* Update the version as per the semantic version rules in
`src/us/kbase/auth2/service/common/ServiceCommon.java`.
`src/main/java/us/kbase/auth2/Version.java`.
* Tag the version in git and github.

### Running tests
Expand Down
21 changes: 1 addition & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def TEMPLATE_LIST_FILE_NAME = "templates.manifest"
task buildGitCommitFile {
doLast {
def commitId = grgit.head().id
// is there a varible for builddir/classe/java/main?
// is there a variable for builddir/classe/java/main?
file("$buildDir/classes/java/main/us/kbase/auth2/gitcommit").text = commitId
}
}
Expand Down Expand Up @@ -69,27 +69,10 @@ jacocoTestReport {
}
}

// TODO NOW run tests from Eclipse w/o specifying classpath manually

// Custom java project layout
sourceSets {
main {
java {
srcDirs = ["src"]
exclude '**/test/**'
}
resources {
srcDirs = ["src"]
include "**/gitcommit"
}
}
test {
java {
srcDirs = ["src"]
include '**/test/**'
}
resources {
srcDirs = ["src"]
include "**/*.testdata"
}
}
Expand All @@ -105,8 +88,6 @@ javadoc {

war {
webXml = file('war/web.xml')
// For some reason the test directories are included in the war file
// although the files are gone. Not sure why
}

configurations {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit bf4bc0c

Please sign in to comment.