morristech
diff --git a/‎Flickr4Java/.gitignore‎
Lines changed: 6 additions & 0 deletions b/‎Flickr4Java/.gitignore‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Flickr4Java/build.gradle‎
Lines changed: 31 additions & 3 deletions b/‎Flickr4Java/build.gradle‎
Lines changed: 31 additions & 3 deletions
diff --git a/‎Flickr4Java/examples/ActivityExample.java‎ ‎…a/src/examples/java/ActivityExample.java‎Flickr4Java/examples/ActivityExample.java renamed to Flickr4Java/src/examples/java/ActivityExample.java b/‎Flickr4Java/examples/ActivityExample.java‎ ‎…a/src/examples/java/ActivityExample.java‎Flickr4Java/examples/ActivityExample.java renamed to Flickr4Java/src/examples/java/ActivityExample.java
diff --git a/‎Flickr4Java/examples/AuthExample.java‎ ‎…4Java/src/examples/java/AuthExample.java‎Flickr4Java/examples/AuthExample.java renamed to Flickr4Java/src/examples/java/AuthExample.java b/‎Flickr4Java/examples/AuthExample.java‎ ‎…4Java/src/examples/java/AuthExample.java‎Flickr4Java/examples/AuthExample.java renamed to Flickr4Java/src/examples/java/AuthExample.java
diff --git a/‎Flickr4Java/examples/Backup.java‎ ‎Flickr4Java/src/examples/java/Backup.java‎Flickr4Java/examples/Backup.java renamed to Flickr4Java/src/examples/java/Backup.java b/‎Flickr4Java/examples/Backup.java‎ ‎Flickr4Java/src/examples/java/Backup.java‎Flickr4Java/examples/Backup.java renamed to Flickr4Java/src/examples/java/Backup.java
diff --git a/‎…r4Java/examples/setup.properties.example‎ ‎…mples/resources/setup.properties.example‎Flickr4Java/examples/setup.properties.example renamed to Flickr4Java/src/examples/resources/setup.properties.example b/‎…r4Java/examples/setup.properties.example‎ ‎…mples/resources/setup.properties.example‎Flickr4Java/examples/setup.properties.example renamed to Flickr4Java/src/examples/resources/setup.properties.example
diff --git a/‎…ava/test/src/completenesstest.properties‎ ‎…st/resources/completenesstest.properties‎Flickr4Java/test/src/completenesstest.properties renamed to Flickr4Java/src/test/resources/completenesstest.properties b/‎…ava/test/src/completenesstest.properties‎ ‎…st/resources/completenesstest.properties‎Flickr4Java/test/src/completenesstest.properties renamed to Flickr4Java/src/test/resources/completenesstest.properties
diff --git a/‎…r4Java/test/src/setup.properties.example‎ ‎…/test/resources/setup.properties.example‎Flickr4Java/test/src/setup.properties.example renamed to Flickr4Java/src/test/resources/setup.properties.example b/‎…r4Java/test/src/setup.properties.example‎ ‎…/test/resources/setup.properties.example‎Flickr4Java/test/src/setup.properties.example renamed to Flickr4Java/src/test/resources/setup.properties.example
@@ -1,2 +1,8 @@
 .gradle
 build/
+out/
+src/examples/resources/setup.properties
+src/test/resources/setup.properties
+Flickr4Java.iml
+Flickr4Java.ipr
+Flickr4Java.iws
@@ -6,16 +6,44 @@ apply plugin: 'maven'
 version = '2.1-SNAPSHOT'
 group = 'com.flicr4java.flickr'
 
-sourceCompatibility = '1.5'
-
+//sourceCompatibility = '1.5'
+//targetCompatibility = '1.5'
 
 repositories {
     mavenCentral()
 }
 
+// add examples in the same way as "main" and "test"
+sourceSets {
+    examples {
+        java {
+            srcDir 'src/examples/java'
+        }
+        resources {
+            srcDir 'src/examples/resources'
+        }
+        //add app classes to examples classpath
+        compileClasspath = compileClasspath + files(sourceSets.main.output.classesDir)
+    }
+}
+
+//make sure app is compiled before we try to compile examples
+compileExamplesJava.dependsOn compileJava
+
+//inherit dependencies from the main app configurations
+configurations {
+    examplesCompile {
+        extendsFrom compile
+    }
+    examplesRuntime {
+        extendsFrom runtime
+    }
+}
 dependencies {
     compile 'org.scribe:scribe:1.3.3'
     compile 'axis:axis:1.4'
     compile 'log4j:log4j:1.2.17'
-    testCompile group: 'junit', name: 'junit', version: '4.+'
+    testCompile group: 'junit', name: 'junit', version: '4.11'
 }
+
+