Merge branch 'dev' of https://github.com/Prototik/ActionBarSherlock i…

…nto Prototik-dev
vvhof · Apr 15, 2013 · db0aea5 · db0aea5
2 parents d372f63 + 4e58ac1
commit db0aea5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/actionbarsherlock-i18n/pom.xml b/actionbarsherlock-i18n/pom.xml
@@ -42,13 +42,14 @@
 
       <plugin>
         <groupId>org.holoeverywhere</groupId>
-        <artifactId>translator</artifactId>
+        <artifactId>resbuilder</artifactId>
         <configuration>
-          <outputDir>${project.basedir}/res</outputDir>
-          <includeDir>${project.basedir}</includeDir>
-          <input>
-            <param>abs__strings.json</param>
-          </input>
+          <includeDirs>
+            <dir>${project.basedir}</dir>
+          </includeDirs>
+          <inputFiles>
+            <file>strings.json:strings</file>
+          </inputFiles>
         </configuration>
       </plugin>
     </plugins>

diff --git a/actionbarsherlock-i18n/abs__strings.json → actionbarsherlock-i18n/strings.json b/actionbarsherlock-i18n/abs__strings.json → actionbarsherlock-i18n/strings.json
diff --git a/pom.xml b/pom.xml
@@ -179,8 +179,8 @@
 
         <plugin>
           <groupId>org.holoeverywhere</groupId>
-          <artifactId>translator</artifactId>
-          <version>1.4.2</version>
+          <artifactId>resbuilder</artifactId>
+          <version>1.5.0</version>
         </plugin>
 
         <plugin>