Merge pull request #93 from Esri/release

Release

Author: tschie

.gitignore

@@ -9,7 +9,6 @@ local.properties
 
 # Intellij project files
 *.ipr
-*.iml
 .idea/
 
 # Eclipse
@@ -35,3 +34,6 @@ local.properties
 Icon?
 ehthumbs.db
 Thumbs.db
+/samples-data/
+/jniLibs/
+/resources/

README.md

@@ -1,43 +1,52 @@
 # ArcGIS Runtime Java SDK Samples
-### Quartz Beta 2
+### 100.0.0
 This project includes a set of samples demonstrating how to accomplish various mapping and GIS tasks with the ArcGIS Runtime SDK for Java.
 
-These samples are built with Gradle. If you want to learn more about Gradle, learn more from [Gradle's guide]
-(https://docs.gradle.org/current/userguide/userguide.html). The samples project has a Gradle multi-project structure.
+These samples are built with Gradle. If you want to learn more about Gradle, learn more from [Gradle's guide](https://docs.gradle.org/current/userguide/userguide.html).
 
-This guide has instructions for running samples using the command line or with the Eclipse and IntelliJ IDEA IDEs.
+This guide has instructions for running samples using the command line or with Eclipse and IntelliJ IDEA.
 
 For developers new to Git, please see the wiki page for how to [clone this repository](https://github.com/Esri/arcgis-runtime-samples-java/wiki/working-with-git).
 
 ## Running the Samples
-To run the samples in a terminal, `cd` into the project and call the gradle run task for the sample:
+To run the samples in a terminal, `cd` into the project and call the gradle `run` task, supplying the sample main class:
 
 On Linux/Mac
 ```
-$ ./gradlew :display-information:show-callout:run
+$ ./gradlew run -PmainClass="com.esri.samples.scene.display_scene.DisplaySceneSample"
 ```
 
 On Windows
 ```
-> gradlew.bat :display-information:show-callout:run
+> gradlew.bat run -PmainClass="com.esri.samples.scene.display_scene.DisplaySceneSample"
 ```
 
+If no `mainClass` property is supplied, the default sample (set in the build.gradle file) will be run. 
+
 There is no need to install Gradle to run the samples.
 
+## The ArcGIS Runtime Gradle Plugin
+The plugin provides the project with everything an ArcGIS runtime project needs to run. It adds the 
+arcgis api as a dependency and downloads the native libraries into `$USER_HOME/.arcgis`. This download occurs 
+automatically the first time you build the project and is only performed once.
+
+## Offline sample data
+Some samples require offline data. A `samples-data` directory will automatically download to the project root the 
+first time you call the `run` task.
+
 ## Importing into an IDE
-We will step through how to import the Samples project into Eclipse and IntelliJ IDEA. In both IDEs you can choose to 
-import all the samples, just a category of samples, or a single sample.
+We will step through how to import the Samples project into Eclipse and IntelliJ IDEA. Other IDEs may support Gradle too. Please consult their documentation for importing Gradle projects.
 
 ### IntelliJ IDEA
 After cloning the samples, open IntelliJ IDEA and follow these steps:
 
 1. Click *Import Projects* from the Welcome Screen or select *File > New > Project from Existing Sources*.
-2. In the select path dialog, select the root `build.gradle` file in the `arcgis-runtime-samples-java` directory. If you only want to import a category of samples, select the `build.gradle` file in that category directory. To import just one sample, select the `build.gradle` file from the sample's directory. Click *OK* after specifying the `build.gradle` file.
+2. In the select path dialog, select the `build.gradle` file in the `arcgis-runtime-samples-java` directory. Click *OK* after specifying the `build.gradle` file.
 3. Click *OK* at the next dialog to complete the import.
 
 <img src="./intellij_proj.png" alt="IntelliJ IDEA project structure" height="200">
 
-To view all of the gradle tasks including the Run task, go to *View > Tool Windows > Gradle*. Select the Run task in the sample's task list to run the sample.
+To view all of the gradle tasks including the Run task, go to *View > Tool Windows > Gradle*.
 
 Alternatively, you can open the sample's main class, right-click, and select *Run* from the dropdown menu.
 
@@ -46,34 +55,22 @@ To import the samples with Eclipse's default gradle plugin, follow these steps:
 
 1. Open Eclipse and select *File > Import*.
 2. In the import wizard, choose *Gradle > Gradle Project*, then click Next.
-3. Select the `arcgis-runtime-samples-java` directory as the project root directory. If you choose a category or sample directory as the root, only those samples will be imported.
+3. Select the `arcgis-runtime-samples-java` directory as the project root directory.
 4. Click *finish* to complete the import.
 
-By default, Eclipse shows each sub-project as a separate project in the workspace. If you want to see the samples in a nested folder view, follow these steps:
-
-1. Open the Project Explorer view by selected *Window > Show view > Project Explorer*.
-2. Click the down-arrow in the top-right corner of the Project Explorer window OR press Ctrl + F10 with the Project 
-Explorer window selected.
-3. In the dropdown menu that appears, select *Projects Presentation > Hierarchical*. Eclipse should now show the 
-samples as a single, nested project. You may need to restart Eclipse for the change to occur.
-
 <img src="./eclipse_proj.png" alt="Eclipse project structure" height="200">
 
-###Other IDEs###
-Other IDEs may support Gradle too. Please consult their documentation for importing Gradle projects.
-
-##Resources##
+## Resources
 * [ArcGIS Runtime SDK for Java](https://developers.arcgis.com/java/)  
 * [ArcGIS Blog](https://blogs.esri.com/esri/arcgis/)  
 * [Esri Twitter](https://twitter.com/esri)  
 
-##Contributing##
-Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing]
-(https://github.com/esri/contributing).
+## Contributing
+Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
 
 Find a bug or want a new feature? Please let us know by submitting an issue.
 
-##Licensing##
+## Licensing
 Copyright 2016 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not 

build.gradle

@@ -1,4 +1,53 @@
-allprojects {
-    apply plugin: 'java'
-    apply plugin: 'eclipse'
+apply plugin: 'com.esri.arcgisruntime.java'
+apply plugin: 'application'
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+buildscript {
+    repositories {
+        maven {
+            url 'https://esri.bintray.com/arcgis'
+        }
+    }
+    dependencies {
+        classpath 'com.esri.arcgisruntime:gradle-arcgis-java-plugin:1.0.0'
+    }
 }
+
+arcgis.version = '100.0.0'
+
+idea.module.downloadJavadoc = true
+eclipse.classpath.downloadJavadoc = true
+
+dependencies {
+    compile 'org.controlsfx:controlsfx:8.40.10'
+    compile 'org.jooq:joox:1.4.0'
+}
+
+task downloadData {
+    description = "Downloads data from AGOL for samples with offline data"
+
+    def rootDir = "./"
+    def dataZip = rootDir + 'data.zip'
+    def samplesData = rootDir + 'samples-data'
+
+    if (!file(samplesData).exists()) {
+        ant.get(src: 'https://arcgisruntime.maps.arcgis' +
+                '.com/sharing/rest/content/items/8b10b52320464b1bb728e552cfa6cb50/data', dest: dataZip)
+        copy {
+            from zipTree(dataZip)
+            into(rootDir)
+        }
+        delete(dataZip)
+    }
+}
+
+run {
+    mainClassName = project.hasProperty("mainClass") ? mainClass : 'com.esri.samples.map.display_map.DisplayMapSample'
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '3.0'
+}
+
+run.dependsOn downloadData