Merge branch 'develop'

GradleFx · Jul 12, 2015 · 28ec575 · 28ec575
2 parents d4e7330 + 3f4eee6
commit 28ec575
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/basic_setup.rst b/basic_setup.rst
@@ -18,7 +18,7 @@ To use the plugin in your project, you'll have to add the following to your buil
             mavenCentral()
         }
         dependencies {
-            classpath group: 'org.gradlefx', name: 'gradlefx', version: '1.2.0'
+            classpath group: 'org.gradlefx', name: 'gradlefx', version: '1.3.0'
         }
     }
 

diff --git a/conf.py b/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/properties_conventions.rst b/properties_conventions.rst
@@ -396,7 +396,7 @@ Example usage (build.gradle)
     srcDirs = ['/src/main/flex']
 
     additionalCompilerOptions = [
-      '-player-version=10',
+      '-target-player=10',
       '-strict=false'
     ]
 

diff --git a/sdk_auto_install.rst b/sdk_auto_install.rst
@@ -52,19 +52,19 @@ For example for the Apache Flex SDK this would be something like this: ::
 			artifactPattern 'http://archive.apache.org/dist/flex/[revision]/binaries/[module]-[revision]-bin.[ext]'
 		}
 		ivy {
-       		name 'Adobe Air SDK'
-        	artifactPattern Os.isFamily(Os.FAMILY_WINDOWS) ?
-            	'http://download.macromedia.com/air/win/download/[revision]/[module].zip' :
-            	'http://download.macromedia.com/air/mac/download/[revision]/[module].tbz2'
-    	}
+			name 'Adobe Air SDK'
+			artifactPattern 'http://download.macromedia.com/air/win/download/[revision]/[module].[ext]'
+		}
 	}
 	
-Always make sure to replace the artifact name, version and extension type with [module], [revision] and [ext] in the pattern, or make the extension dynamic as shown above for the AIR SDK.
+
+.. note:: Always make sure to replace the artifact name, version and extension type with [module], [revision] and [ext] in the pattern.
+
 Once you've defined the pattern you can define the dependencies like this: ::
 
     dependencies {
 	    flexSDK group: 'org.apache', name: 'apache-flex-sdk', version: '4.9.0', ext: Os.isFamily(Os.FAMILY_WINDOWS) ? 'zip' : 'tar.gz'
-	    airSDK  group: 'com.adobe', name: 'AdobeAIRSDK', version: '3.4'
+	    airSDK  group: 'com.adobe', name: 'AdobeAIRSDK', version: '3.4', ext: Os.isFamily(Os.FAMILY_WINDOWS) ? 'zip' : 'tbz2'
 	}
 	
 ^^^^^^^^^^^^^^^^^^^^^

diff --git a/tasks.rst b/tasks.rst
@@ -25,7 +25,7 @@ The GradleFx plugin adds the following tasks to your project:
 | copytestresources           | n/a                                                | Copies the test resources from the test 'resources'           |
 |                             |                                                    | directory to the build directory                              |
 +-----------------------------+----------------------------------------------------+---------------------------------------------------------------+
-| publish                     | n/a                                                | Copies the files from the build directory to the publish      |
+| publishFx                   | n/a                                                | Copies the files from the build directory to the publish      |
 |                             |                                                    | directory.                                                    |
 +-----------------------------+----------------------------------------------------+---------------------------------------------------------------+
 | createHtmlWrapper           | n/a                                                | Creates an HTML wrapper for the project's swf                 |