Browse code

try to fix gwt build

devnewton authored on 17/07/2014 at 22:12:08
Showing 4 changed files
... ...
@@ -35,16 +35,19 @@ import org.geekygoblin.nedetlesmaki.core.NamedEntities;
35 35
 public class HideMenuTrigger extends OneShotTrigger {
36 36
     private final Entity mainMenu;
37 37
     private final Entity ingameControls;
38
+    private final Entity inGameUI;
38 39
     
39 40
     @Inject
40
-    public HideMenuTrigger(@NamedEntities.MainMenu Entity mainMenu,@NamedEntities.IngameControls Entity ingameControls) {
41
+    public HideMenuTrigger(@NamedEntities.MainMenu Entity mainMenu, @NamedEntities.InGameUI Entity inGameUI, @NamedEntities.IngameControls Entity ingameControls) {
41 42
         this.mainMenu = mainMenu;
42 43
         this.ingameControls = ingameControls;
44
+        this.inGameUI = inGameUI;
43 45
     }
44 46
 
45 47
     @Override
46 48
     public void process(NedGame game) {
47 49
         mainMenu.disable();
48 50
         ingameControls.enable();
51
+        inGameUI.enable();
49 52
     }    
50 53
 }
... ...
@@ -100,13 +100,18 @@
100 100
             <artifactId>artemis-odb-gwt</artifactId>
101 101
             <classifier>sources</classifier>
102 102
         </dependency>
103
-        
103
+        <dependency>
104
+            <artifactId>gwt-user</artifactId>
105
+            <groupId>com.google.gwt</groupId>
106
+            <type>jar</type>
107
+        </dependency>
104 108
     </dependencies>
105 109
     <build>
106 110
         <plugins>
107 111
             <plugin>
108 112
                 <groupId>org.codehaus.mojo</groupId>
109 113
                 <artifactId>gwt-maven-plugin</artifactId>
114
+                <version>${gwt.version}</version>
110 115
                 <executions>
111 116
                     <execution>
112 117
                         <phase>prepare-package</phase>
... ...
@@ -2,9 +2,10 @@
2 2
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 3
     <modelVersion>4.0.0</modelVersion>
4 4
     <parent>
5
-        <groupId>com.googlecode.playn</groupId>
6
-        <artifactId>playn-project</artifactId>
7
-        <version>1.8.5</version>
5
+        <groupId>org.geekygoblin</groupId>
6
+        <artifactId>nedetlesmaki</artifactId>
7
+        <version>0.4-SNAPSHOT</version>
8
+        <relativePath>../../pom.xml</relativePath>
8 9
     </parent>
9 10
 
10 11
     <groupId>org.geekygoblin</groupId>
... ...
@@ -12,143 +13,10 @@
12 12
     <version>0.4-SNAPSHOT</version>
13 13
     <packaging>pom</packaging>
14 14
     <name>nedetlesmaki-playn</name>
15
-
16
-    <properties>
17
-        <playn.version>1.8.5</playn.version>
18
-        <jnuit.version>0.11</jnuit.version>
19
-    </properties>
20
-    <dependencyManagement>
21
-        <dependencies>
22
-            <dependency>
23
-                <groupId>com.googlecode.playn</groupId>
24
-                <artifactId>playn-core</artifactId>
25
-                <version>${playn.version}</version>
26
-            </dependency>
27
-            <dependency>
28
-                <groupId>com.googlecode.playn</groupId>
29
-                <artifactId>playn-android</artifactId>
30
-                <version>${playn.version}</version>
31
-            </dependency>
32
-            <dependency>
33
-                <groupId>com.googlecode.playn</groupId>
34
-                <artifactId>playn-java</artifactId>
35
-                <version>${playn.version}</version>
36
-            </dependency>
37
-            <dependency>
38
-                <groupId>com.googlecode.playn</groupId>
39
-                <artifactId>playn-html</artifactId>
40
-                <version>${playn.version}</version>
41
-            </dependency>
42
-            <dependency>
43
-                <groupId>com.googlecode.playn</groupId>
44
-                <artifactId>playn-html</artifactId>
45
-                <classifier>sources</classifier>
46
-                <version>${playn.version}</version>
47
-            </dependency>
48
-            <dependency>
49
-                <groupId>com.googlecode.playn</groupId>
50
-                <artifactId>playn-ios</artifactId>
51
-                <version>${playn.version}</version>
52
-            </dependency>
53
-            <dependency>
54
-                <groupId>org.geekygoblin</groupId>
55
-                <artifactId>nedetlesmaki-playn-core</artifactId>
56
-                <version>${project.version}</version>   
57
-            </dependency>
58
-            <dependency>
59
-                <groupId>org.geekygoblin</groupId>
60
-                <artifactId>nedetlesmaki-playn-core</artifactId>
61
-                <version>${project.version}</version>   
62
-                <classifier>sources</classifier>
63
-            </dependency>
64
-            <dependency>
65
-                <groupId>org.geekygoblin</groupId>
66
-                <artifactId>nedetlesmaki-playn-assets</artifactId>
67
-                <version>${project.version}</version>   
68
-            </dependency>
69
-            <dependency>
70
-                <groupId>org.geekygoblin</groupId>
71
-                <artifactId>nedetlesmaki-core</artifactId>
72
-                <version>${project.version}</version>
73
-            </dependency>
74
-            <dependency>
75
-                <groupId>org.geekygoblin</groupId>
76
-                <artifactId>nedetlesmaki-core</artifactId>
77
-                <classifier>sources</classifier>
78
-                <version>${project.version}</version>
79
-            </dependency>
80
-            <dependency>
81
-                <groupId>com.github.asilvestre</groupId>
82
-                <artifactId>jpurexml</artifactId>
83
-                <classifier>sources</classifier>
84
-                <version>0.12</version>
85
-            </dependency>
86
-            <dependency>
87
-                <groupId>im.bci</groupId>
88
-                <artifactId>libtiled-jpurexml</artifactId>
89
-                <classifier>sources</classifier>
90
-                <version>0.4</version>
91
-            </dependency>
92
-            <dependency>
93
-                <groupId>im.bci</groupId>
94
-                <artifactId>jnuit-playn-utils</artifactId>
95
-                <version>${jnuit.version}</version>
96
-            </dependency>
97
-            <dependency>
98
-                <groupId>im.bci</groupId>
99
-                <artifactId>jnuit-core</artifactId>
100
-                <classifier>sources</classifier>
101
-                <version>${jnuit.version}</version>
102
-            </dependency>
103
-            <dependency>
104
-                <groupId>im.bci</groupId>
105
-                <artifactId>tablelayout</artifactId>
106
-                <version>${jnuit.version}</version>
107
-                <classifier>sources</classifier>
108
-            </dependency>
109
-            <dependency>
110
-                <groupId>im.bci</groupId>
111
-                <artifactId>jnuit-playn</artifactId>
112
-                <classifier>sources</classifier>
113
-                <version>${jnuit.version}</version>
114
-            </dependency>
115
-            <dependency>
116
-                <groupId>im.bci</groupId>
117
-                <artifactId>jnuit-playn-utils</artifactId>
118
-                <classifier>sources</classifier>
119
-                <version>${jnuit.version}</version>
120
-            </dependency>
121
-            <dependency>
122
-                <groupId>im.bci</groupId>
123
-                <artifactId>jnuit-artemis</artifactId>
124
-                <classifier>sources</classifier>
125
-                <version>${jnuit.version}</version>
126
-            </dependency>
127
-            <dependency>
128
-                <groupId>javax.inject</groupId>
129
-                <artifactId>javax.inject</artifactId>
130
-                <classifier>sources</classifier>
131
-                <version>1</version>
132
-            </dependency>
133
-            <dependency>
134
-                <groupId>net.onedaybeard.artemis</groupId>
135
-                <artifactId>artemis-odb</artifactId>
136
-                <classifier>sources</classifier>
137
-                <version>0.6.3</version>
138
-            </dependency>
139
-            <dependency>
140
-                <groupId>net.onedaybeard.artemis</groupId>
141
-                <artifactId>artemis-odb-gwt</artifactId>
142
-                <version>0.6.3</version>
143
-            </dependency>
144
-            <dependency>
145
-                <groupId>net.onedaybeard.artemis</groupId>
146
-                <artifactId>artemis-odb-gwt</artifactId>
147
-                <classifier>sources</classifier>
148
-                <version>0.6.3</version>
149
-            </dependency>
150
-        </dependencies>
151
-    </dependencyManagement>
15
+    <modules>
16
+        <module>assets</module>
17
+        <module>core</module>
18
+    </modules>
152 19
     <profiles>
153 20
         <profile>
154 21
             <id>java</id>
... ...
@@ -178,8 +46,4 @@
178 178
             </modules>
179 179
         </profile>
180 180
     </profiles>
181
-    <modules>
182
-        <module>assets</module>
183
-        <module>core</module>
184
-    </modules>
185 181
 </project>
... ...
@@ -11,6 +11,8 @@
11 11
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
12 12
         <jnuit.version>0.11</jnuit.version>
13 13
         <lwjgl.version>2.9.1</lwjgl.version>
14
+        <playn.version>1.8.5</playn.version>
15
+        <gwt.version>2.6.1</gwt.version>
14 16
     </properties>
15 17
     <modules>
16 18
         <module>core</module>
... ...
@@ -21,6 +23,7 @@
21 21
         <module>packages/win</module>
22 22
         <module>packages/rpm32</module>
23 23
         <module>packages/rpm64</module>
24
+        <module>playn/nedetlesmaki-playn</module>
24 25
     </modules>
25 26
     <dependencyManagement>
26 27
         <dependencies>
... ...
@@ -52,7 +55,7 @@
52 52
             <dependency>
53 53
                 <groupId>net.onedaybeard.artemis</groupId>
54 54
                 <artifactId>artemis-odb</artifactId>
55
-                <version>0.6.3</version>
55
+                <version>0.6.5</version>
56 56
             </dependency>
57 57
             <dependency>
58 58
                 <groupId>im.bci</groupId>
... ...
@@ -94,6 +97,157 @@
94 94
                 <artifactId>javax.inject</artifactId>
95 95
                 <version>1</version>
96 96
             </dependency>
97
+            <dependency>
98
+                <groupId>com.googlecode.playn</groupId>
99
+                <artifactId>playn-core</artifactId>
100
+                <version>${playn.version}</version>
101
+            </dependency>
102
+            <dependency>
103
+                <groupId>com.googlecode.playn</groupId>
104
+                <artifactId>playn-android</artifactId>
105
+                <version>${playn.version}</version>
106
+            </dependency>
107
+            <dependency>
108
+                <groupId>com.googlecode.playn</groupId>
109
+                <artifactId>playn-java</artifactId>
110
+                <version>${playn.version}</version>
111
+            </dependency>
112
+            <dependency>
113
+                <groupId>com.googlecode.playn</groupId>
114
+                <artifactId>playn-html</artifactId>
115
+                <version>${playn.version}</version>
116
+            </dependency>
117
+            <dependency>
118
+                <groupId>com.googlecode.playn</groupId>
119
+                <artifactId>playn-html</artifactId>
120
+                <classifier>sources</classifier>
121
+                <version>${playn.version}</version>
122
+            </dependency>
123
+            <dependency>
124
+                <groupId>com.googlecode.playn</groupId>
125
+                <artifactId>playn-ios</artifactId>
126
+                <version>${playn.version}</version>
127
+            </dependency>
128
+            <dependency>
129
+                <groupId>org.geekygoblin</groupId>
130
+                <artifactId>nedetlesmaki-playn-core</artifactId>
131
+                <version>${project.version}</version>   
132
+            </dependency>
133
+            <dependency>
134
+                <groupId>org.geekygoblin</groupId>
135
+                <artifactId>nedetlesmaki-playn-core</artifactId>
136
+                <version>${project.version}</version>   
137
+                <classifier>sources</classifier>
138
+            </dependency>
139
+            <dependency>
140
+                <groupId>org.geekygoblin</groupId>
141
+                <artifactId>nedetlesmaki-playn-assets</artifactId>
142
+                <version>${project.version}</version>   
143
+            </dependency>
144
+            <dependency>
145
+                <groupId>org.geekygoblin</groupId>
146
+                <artifactId>nedetlesmaki-core</artifactId>
147
+                <version>${project.version}</version>
148
+            </dependency>
149
+            <dependency>
150
+                <groupId>org.geekygoblin</groupId>
151
+                <artifactId>nedetlesmaki-core</artifactId>
152
+                <classifier>sources</classifier>
153
+                <version>${project.version}</version>
154
+            </dependency>
155
+            <dependency>
156
+                <groupId>com.github.asilvestre</groupId>
157
+                <artifactId>jpurexml</artifactId>
158
+                <classifier>sources</classifier>
159
+                <version>0.12</version>
160
+            </dependency>
161
+            <dependency>
162
+                <groupId>im.bci</groupId>
163
+                <artifactId>libtiled-jpurexml</artifactId>
164
+                <classifier>sources</classifier>
165
+                <version>0.4</version>
166
+            </dependency>
167
+            <dependency>
168
+                <groupId>im.bci</groupId>
169
+                <artifactId>jnuit-playn-utils</artifactId>
170
+                <version>${jnuit.version}</version>
171
+            </dependency>
172
+            <dependency>
173
+                <groupId>im.bci</groupId>
174
+                <artifactId>jnuit-core</artifactId>
175
+                <classifier>sources</classifier>
176
+                <version>${jnuit.version}</version>
177
+            </dependency>
178
+            <dependency>
179
+                <groupId>im.bci</groupId>
180
+                <artifactId>tablelayout</artifactId>
181
+                <version>${jnuit.version}</version>
182
+                <classifier>sources</classifier>
183
+            </dependency>
184
+            <dependency>
185
+                <groupId>im.bci</groupId>
186
+                <artifactId>jnuit-playn</artifactId>
187
+                <classifier>sources</classifier>
188
+                <version>${jnuit.version}</version>
189
+            </dependency>
190
+            <dependency>
191
+                <groupId>im.bci</groupId>
192
+                <artifactId>jnuit-playn-utils</artifactId>
193
+                <classifier>sources</classifier>
194
+                <version>${jnuit.version}</version>
195
+            </dependency>
196
+            <dependency>
197
+                <groupId>im.bci</groupId>
198
+                <artifactId>jnuit-artemis</artifactId>
199
+                <classifier>sources</classifier>
200
+                <version>${jnuit.version}</version>
201
+            </dependency>
202
+            <dependency>
203
+                <groupId>javax.inject</groupId>
204
+                <artifactId>javax.inject</artifactId>
205
+                <classifier>sources</classifier>
206
+                <version>1</version>
207
+            </dependency>
208
+            <dependency>
209
+                <groupId>net.onedaybeard.artemis</groupId>
210
+                <artifactId>artemis-odb</artifactId>
211
+                <classifier>sources</classifier>
212
+                <version>0.6.5</version>
213
+            </dependency>
214
+            <dependency>
215
+                <groupId>net.onedaybeard.artemis</groupId>
216
+                <artifactId>artemis-odb-gwt</artifactId>
217
+                <version>0.6.5</version>
218
+            </dependency>
219
+            <dependency>
220
+                <groupId>net.onedaybeard.artemis</groupId>
221
+                <artifactId>artemis-odb-gwt</artifactId>
222
+                <classifier>sources</classifier>
223
+                <version>0.6.5</version>
224
+            </dependency>
225
+            <dependency>
226
+                <artifactId>gwt-user</artifactId>
227
+                <groupId>com.google.gwt</groupId>
228
+                <type>jar</type>
229
+                <version>2.6.1</version>
230
+            </dependency>
97 231
         </dependencies>
98 232
     </dependencyManagement>
233
+    <profiles>
234
+        <profile>
235
+            <id>java</id>
236
+            <activation>
237
+                <activeByDefault>true</activeByDefault>
238
+            </activation>
239
+        </profile>
240
+        <profile>
241
+            <id>android</id>
242
+        </profile>
243
+        <profile>
244
+            <id>ios</id>
245
+        </profile>
246
+        <profile>
247
+            <id>html</id>
248
+        </profile>
249
+    </profiles>
99 250
 </project>