Skip to content

Commit

Permalink
updated all modules to use AIR 22
Browse files Browse the repository at this point in the history
  • Loading branch information
PrimaryFeather committed Sep 5, 2016
1 parent ebfac5f commit d071fde
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions samples/demo/demo-shared.iml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-21" />
<sdk name="air-22" />
</dependencies>
<compiler-options />
<packaging-air-desktop />
Expand All @@ -25,7 +25,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="starling" exported="" />
</component>
Expand Down
4 changes: 2 additions & 2 deletions samples/demo_mobile/demo-mobile.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-21" />
<sdk name="air-22" />
</dependencies>
<compiler-options>
<map>
Expand Down Expand Up @@ -44,7 +44,7 @@
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
<excludeFolder url="file://$MODULE_DIR$/bin-release" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="starling" exported="" />
<orderEntry type="module" module-name="demo-shared" exported="" />
Expand Down
2 changes: 1 addition & 1 deletion samples/demo_mobile/src/Demo_Mobile-app.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<application xmlns="http://ns.adobe.com/air/application/21.0">
<application xmlns="http://ns.adobe.com/air/application/22.0">

<id>com.gamua.starling.demo</id> <!-- Bundle Identifier. Required. -->
<filename>Starling-Demo</filename> <!-- Used as the filename for the application. Required. -->
Expand Down
6 changes: 3 additions & 3 deletions samples/demo_web/demo-web.iml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<component name="FlexBuildConfigurationManager" active="demo-web">
<configurations>
<configuration name="demo-web" pure-as="true" main-class="Demo_Web_Preloader" output-file="demo_web.swf" output-folder="$MODULE_DIR$/out">
<dependencies target-player="21.0">
<dependencies target-player="22.0">
<entries>
<entry module-name="demo-shared" build-configuration-name="demo-shared">
<dependency linkage="Merged" />
Expand All @@ -12,7 +12,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-21" />
<sdk name="air-22" />
</dependencies>
<compiler-options>
<map>
Expand All @@ -34,7 +34,7 @@
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
<excludeFolder url="file://$MODULE_DIR$/bin-release" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="starling" exported="" />
<orderEntry type="module" module-name="demo-shared" exported="" />
Expand Down
4 changes: 2 additions & 2 deletions samples/scaffold_mobile/scaffold-mobile.iml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-21" />
<sdk name="air-22" />
</dependencies>
<compiler-options />
<packaging-air-desktop />
Expand All @@ -36,7 +36,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="starling" exported="" />
</component>
Expand Down
2 changes: 1 addition & 1 deletion samples/scaffold_mobile/src/Scaffold_Mobile-app.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<application xmlns="http://ns.adobe.com/air/application/21.0">
<application xmlns="http://ns.adobe.com/air/application/22.0">

<id>com.gamua.starling.scaffold</id> <!-- Bundle Identifier. Required. -->
<filename>Scaffold</filename> <!-- Used as the filename for the application. Required. -->
Expand Down
6 changes: 3 additions & 3 deletions starling/starling.iml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<component name="FlexBuildConfigurationManager" active="starling">
<configurations>
<configuration name="starling" pure-as="true" output-type="Library" output-file="starling.swc" output-folder="$MODULE_DIR$/bin-debug">
<dependencies target-player="21.0">
<sdk name="air-21" />
<dependencies target-player="22.0">
<sdk name="air-22" />
</dependencies>
<compiler-options />
<packaging-air-desktop />
Expand All @@ -23,7 +23,7 @@
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/doc" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
6 changes: 3 additions & 3 deletions tests/starling-tests.iml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<component name="FlexBuildConfigurationManager" active="FlexUnitRunner">
<configurations>
<configuration name="FlexUnitRunner" pure-as="true" main-class="FlexUnitRunner" output-file="FlexUnitRunner.swf" output-folder="$MODULE_DIR$/out">
<dependencies target-player="21.0">
<dependencies target-player="22.0">
<entries>
<entry library-id="f0cf5e4a-a937-48b8-8262-ef4e4bd4e764">
<dependency linkage="Merged" />
Expand All @@ -12,7 +12,7 @@
<dependency linkage="Merged" />
</entry>
</entries>
<sdk name="air-21" />
<sdk name="air-22" />
</dependencies>
<compiler-options>
<map>
Expand All @@ -32,7 +32,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/bin-debug" />
</content>
<orderEntry type="jdk" jdkName="air-21" jdkType="Flex SDK Type (new)" />
<orderEntry type="jdk" jdkName="air-22" jdkType="Flex SDK Type (new)" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library type="flex">
Expand Down

0 comments on commit d071fde

Please sign in to comment.