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.

2025-06-17 07:50:52 -07:00 · 2016-06-16 12:20:54 -04:00 · 2016-06-16 12:20:54 -04:00 · 80f9e48e64
commit 80f9e48e64
parent 0e0f3f2167
25 changed files with 8 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,9 @@ build
 .classpath
 .project
 .settings/
+/.gradle/
+/gradle/
+/gradlew
+/gradlew.bat
+.gitmodules
+src/main/
--- a/build.gradle
+++ b/build.gradle
@ -4,21 +4,8 @@ apply plugin: 'jacoco'

 sourceSets {
  // Uncomment main if you have merged JSON-Java and JSON-Java-unit-test code
-  main {
-    java {
-      srcDir 'src'
-      exclude 'test/' 
-    }
-  }
-  test {
-    java {
-      srcDir 'src/test'
-      exclude 'resources/'
-    }
-    resources {
-       srcDir 'resources'
-    }
-  }
+  main
+  test
 }

 repositories {
--- a/src/test/java/org/json/junit/CDLTest.java
+++ b/src/test/java/org/json/junit/CDLTest.java
--- a/src/test/java/org/json/junit/CookieListTest.java
+++ b/src/test/java/org/json/junit/CookieListTest.java
--- a/src/test/java/org/json/junit/CookieTest.java
+++ b/src/test/java/org/json/junit/CookieTest.java
--- a/src/test/java/org/json/junit/EnumTest.java
+++ b/src/test/java/org/json/junit/EnumTest.java
--- a/src/test/java/org/json/junit/HTTPTest.java
+++ b/src/test/java/org/json/junit/HTTPTest.java
--- a/src/test/java/org/json/junit/JSONArrayTest.java
+++ b/src/test/java/org/json/junit/JSONArrayTest.java
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
--- a/src/test/java/org/json/junit/JSONObjectTest.java
+++ b/src/test/java/org/json/junit/JSONObjectTest.java
--- a/src/test/java/org/json/junit/JSONPointerTest.java
+++ b/src/test/java/org/json/junit/JSONPointerTest.java
--- a/src/test/java/org/json/junit/JSONStringerTest.java
+++ b/src/test/java/org/json/junit/JSONStringerTest.java
--- a/src/test/java/org/json/junit/JunitTestSuite.java
+++ b/src/test/java/org/json/junit/JunitTestSuite.java
--- a/src/test/java/org/json/junit/MyBean.java
+++ b/src/test/java/org/json/junit/MyBean.java
--- a/src/test/java/org/json/junit/MyBigNumberBean.java
+++ b/src/test/java/org/json/junit/MyBigNumberBean.java
--- a/src/test/java/org/json/junit/MyEnum.java
+++ b/src/test/java/org/json/junit/MyEnum.java
--- a/src/test/java/org/json/junit/MyEnumClass.java
+++ b/src/test/java/org/json/junit/MyEnumClass.java
--- a/src/test/java/org/json/junit/MyEnumField.java
+++ b/src/test/java/org/json/junit/MyEnumField.java
--- a/src/test/java/org/json/junit/MyJsonString.java
+++ b/src/test/java/org/json/junit/MyJsonString.java
--- a/src/test/java/org/json/junit/MyPublicClass.java
+++ b/src/test/java/org/json/junit/MyPublicClass.java
--- a/src/test/java/org/json/junit/PropertyTest.java
+++ b/src/test/java/org/json/junit/PropertyTest.java
--- a/src/test/java/org/json/junit/StringsResourceBundle.java
+++ b/src/test/java/org/json/junit/StringsResourceBundle.java
--- a/src/test/java/org/json/junit/TestRunner.java
+++ b/src/test/java/org/json/junit/TestRunner.java
--- a/src/test/java/org/json/junit/Util.java
+++ b/src/test/java/org/json/junit/Util.java
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java