Skip to content

Commit 80f9e48

Browse files
author
John J. Aylward
committed
Moves src folder to simplify build.gradle configuration. If JSON-Java source is merged, it's src fold would now be src/main/java/org.json/ instead of src/main/org.json as well.
1 parent 0e0f3f2 commit 80f9e48

25 files changed

+8
-15
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@ build
33
.classpath
44
.project
55
.settings/
6+
/.gradle/
7+
/gradle/
8+
/gradlew
9+
/gradlew.bat
10+
.gitmodules
11+
src/main/

build.gradle

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,8 @@ apply plugin: 'jacoco'
44

55
sourceSets {
66
// Uncomment main if you have merged JSON-Java and JSON-Java-unit-test code
7-
main {
8-
java {
9-
srcDir 'src'
10-
exclude 'test/'
11-
}
12-
}
13-
test {
14-
java {
15-
srcDir 'src/test'
16-
exclude 'resources/'
17-
}
18-
resources {
19-
srcDir 'resources'
20-
}
21-
}
7+
main
8+
test
229
}
2310

2411
repositories {
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 commit comments

Comments
 (0)