From 884ed9747c35dcfd7ded4d8355111b53951e3efb Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Thu, 7 Nov 2013 23:29:31 +0200 Subject: [PATCH 01/12] Remove FDT related files because you should not include IDE files in repository --- .project | 17 ----------------- .settings/com.powerflasher.fdt.classpath | 15 --------------- .settings/com.powerflasher.fdt.core.prefs | 15 --------------- .settings/org.eclipse.core.resources.prefs | 3 --- 4 files changed, 50 deletions(-) delete mode 100644 .project delete mode 100644 .settings/com.powerflasher.fdt.classpath delete mode 100644 .settings/com.powerflasher.fdt.core.prefs delete mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.project b/.project deleted file mode 100644 index d376ddf..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Gestouch - - - - - - com.powerflasher.fdt.core.FlashBuilder - - - - - - com.powerflasher.fdt.core.FlashNature - - diff --git a/.settings/com.powerflasher.fdt.classpath b/.settings/com.powerflasher.fdt.classpath deleted file mode 100644 index 9292307..0000000 --- a/.settings/com.powerflasher.fdt.classpath +++ /dev/null @@ -1,15 +0,0 @@ - - - libs - src - frameworks/libs/air/airglobal.swc - frameworks/libs/mobile/mobilecomponents.swc - frameworks/libs/textLayout.swc - frameworks/libs/framework.swc - frameworks/libs/spark.swc - frameworks/libs/sparkskins.swc - frameworks/libs/air/servicemonitor.swc - frameworks/themes/Mobile/mobile.swc - frameworks/libs/mx/mx.swc - libs/starling.swc - diff --git a/.settings/com.powerflasher.fdt.core.prefs b/.settings/com.powerflasher.fdt.core.prefs deleted file mode 100644 index f2cc2b0..0000000 --- a/.settings/com.powerflasher.fdt.core.prefs +++ /dev/null @@ -1,15 +0,0 @@ -#Mon Apr 25 18:38:51 EEST 2011 -com.powerflasher.fdt.core.CompatiblePlayers=AIR_Debug_Launcher -com.powerflasher.fdt.core.CompilerArguments=-load-config\="{flexSDK}/frameworks/airmobile-config.xml"\n-target-player\={playerVersion}\n-library-path+\="{flexSDK}/frameworks/locale/en_US" -com.powerflasher.fdt.core.DefaultOutputFolder=bin -com.powerflasher.fdt.core.DefaultPlayer=AIR_Debug_Launcher -com.powerflasher.fdt.core.Language=AS3 -com.powerflasher.fdt.core.PassClasspath=true -com.powerflasher.fdt.core.PassMainclass=true -com.powerflasher.fdt.core.PassRsls=false -com.powerflasher.fdt.core.PassSwcs=true -com.powerflasher.fdt.core.PlayerVersion=10.2 -com.powerflasher.fdt.core.ProjectTypeHint=Flex 4.5 Mobile -com.powerflasher.fdt.core.Runtime=AIR -com.powerflasher.fdt.core.SdkName=Flex 4.5 -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 2140b16..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sun Apr 17 10:41:00 EEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 From b47135949daf95f25fbcf54064e779c45b732146 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Fri, 8 Nov 2013 01:25:23 +0200 Subject: [PATCH 02/12] Add Maven build support special thanks to Sergey Egorov @bsideup --- .gitignore | 3 +- pom.xml | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index 5d2c6e0..bb2f415 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ build.properties *.iml *.ipr *.iws -.idea/ \ No newline at end of file +.idea/ +target/ \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..36f219c --- /dev/null +++ b/pom.xml @@ -0,0 +1,230 @@ + + + 4.0.0 + + org.gestouch + gestouch + swc + 0.4.7-SNAPSHOT + + + 5.0-beta + 4.6.b.23201 + + + + src/ + + + + net.flexmojos.oss + flexmojos-maven-plugin + ${flexmojos.version} + true + + true + + true + true + true + true + true + + + + Abstract + + + + + com.adobe.flex + compiler + ${flex.sdk.version} + pom + + + + + + net.flexmojos.oss + flexmojos-maven-plugin + + + prepare-package + + asdoc + + + + + + true + true + Gestouch ${project.version} + Gestouch ${project.version} +
Gestouch - http://github.com/fljot/Gestouch/ - Documentation generated at: ${maven.build.timestamp}
+ + + + + maven-antrun-plugin + 1.7 + + + fail-to-deploy-in-develop + package + + + + + + + + + + + + + run + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.3 + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/${project.artifactId}-fat-${project.version}.swc + swc + fat + + + + + + + + + + + + + + org.sonatype.flexmojos + flexmojos-maven-plugin + ${flexmojos.version} + + + flex-reports + + asdoc-report + + + + + + + + + + com.adobe.flex + compiler + ${flex.sdk.version} + pom + + + + com.adobe.flex.framework + flex-framework + ${flex.sdk.version} + pom + provided + + + + com.gamua + starling-framework + [1.1,] + swc + + + + + + flex-mojos-repository + http://repository.sonatype.org/content/groups/flexgroup + + + + trylogic + Trylogic + http://repo.trylogic.ru/content/repositories/public/ + + true + daily + warn + + + true + daily + warn + + default + + + + trylogic-releases + Trylogic releases + http://repo.trylogic.ru/content/repositories/releases/ + + true + daily + warn + + + false + + default + + + + + + flex-mojos-plugin-repository + http://repository.sonatype.org/content/groups/flexgroup + + true + never + + + false + never + + + + + + + Pavel fljōt Pevnitskiy + pavel.fljot at gmail.com + + + From 040fd34e7f7c574ca35a1cd86b7325fc4c35acb8 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Fri, 8 Nov 2013 01:42:10 +0200 Subject: [PATCH 03/12] Update POM with some useful stuff --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 36f219c..cd5bf11 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,24 @@ 4.6.b.23201 + + + jenkins + https://fljot.ci.cloudbees.com/job/Gestouch/ + + + + github + https://github.com/fljot/Gestouch/issues + + + + + https://github.com/fljot/Gestouch + scm:git:ssh://git@github.com:fljot/Gestouch.git + scm:git:ssh://git@github.com:fljot/Gestouch.git + + src/ From 77afe8cba163e414f9142943add515a923a561c6 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Sat, 9 Nov 2013 11:23:28 +0200 Subject: [PATCH 04/12] Fix Starling Maven repository --- pom.xml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index cd5bf11..efe1632 100644 --- a/pom.xml +++ b/pom.xml @@ -192,35 +192,14 @@ - trylogic - Trylogic - http://repo.trylogic.ru/content/repositories/public/ + starling-repository + http://repository-trylogic.forge.cloudbees.com/snapshot - true - daily - warn - - - true - daily - warn - - default - - - - trylogic-releases - Trylogic releases - http://repo.trylogic.ru/content/repositories/releases/ - - true - daily - warn - - false + + + true - default From ab74d7c8fe353f4c51f4fbdca820551b798ec9b2 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Sat, 9 Nov 2013 11:33:22 +0200 Subject: [PATCH 05/12] Fix POM --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index efe1632..2bba39f 100644 --- a/pom.xml +++ b/pom.xml @@ -116,6 +116,8 @@ + + From 60548789895952328370cf7ebd3dd9f30dff5b86 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Wed, 26 Jun 2013 16:02:43 +0300 Subject: [PATCH 06/12] Touch cloning fix --- src/org/gestouch/core/Touch.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/gestouch/core/Touch.as b/src/org/gestouch/core/Touch.as index c4d9440..b738a4a 100644 --- a/src/org/gestouch/core/Touch.as +++ b/src/org/gestouch/core/Touch.as @@ -116,8 +116,8 @@ package org.gestouch.core public function clone():Touch { var touch:Touch = new Touch(id); - touch._location = _location; - touch._beginLocation = _beginLocation; + touch._location = _location.clone(); + touch._beginLocation = _beginLocation.clone(); touch.target = target; touch.sizeX = sizeX; touch.sizeY = sizeY; From e4ca10cb91dc5792ed09d5cc0560ff95e2ba0637 Mon Sep 17 00:00:00 2001 From: Pavel fljot Date: Sat, 14 Dec 2013 10:53:26 +0200 Subject: [PATCH 07/12] Another small POM fix --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bba39f..64b9ecc 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ true true true - true true