2.11 support

banshee · Apr 27, 2014 · edb5e46 · edb5e46
1 parent 5180d63
commit edb5e46
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/com.restphone.androidproguardscala.plugin/.classpath b/com.restphone.androidproguardscala.plugin/.classpath
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar" sourcepath="/AndroidProguardScalaLib"/>
+	<classpathentry exported="true" kind="lib" path="lib/scala-library_2.11-1.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/scala-parser-combinators_2.11-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/scala-xml_2.11-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/scalaz-core_2.11-7.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm-4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-16.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jartender_2.10-0.7-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jartender_2.11-0.7-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/proguard-base-4.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/scalaz-core_2.10-7.0.6.jar"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/com.restphone.androidproguardscala.plugin/META-INF/MANIFEST.MF b/com.restphone.androidproguardscala.plugin/META-INF/MANIFEST.MF
@@ -7,17 +7,19 @@ Bundle-Version: 0.0.51.qualifier
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.ui,
- org.eclipse.jdt.core;bundle-version="3.6.2",
- org.scala-ide.scala.library
+ org.eclipse.jdt.core;bundle-version="3.6.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.restphone.androidproguardscala
 Bundle-ClassPath: target/classes/,
  .,
- lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar,
+ lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar,
  lib/asm-4.1.jar,
  lib/guava-16.0.1.jar,
- lib/jartender_2.10-0.7-SNAPSHOT.jar,
- lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar,
+ lib/jartender_2.11-0.7-SNAPSHOT.jar,
+ lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar,
  lib/proguard-base-4.10.jar,
- lib/scalaz-core_2.10-7.0.6.jar
+ lib/scalaz-core_2.11-7.0.6.jar,
+ lib/scala-xml_2.11-1.0.1.jar,
+ lib/scala-parser-combinators_2.11-1.0.1.jar,
+ lib/scala-library_2.11-1.0.0.jar
 Bundle-ActivationPolicy: lazy
diff --git a/com.restphone.androidproguardscala.plugin/build.properties b/com.restphone.androidproguardscala.plugin/build.properties
@@ -7,13 +7,16 @@ bin.includes = plugin.xml,\
                COPYING,\
                proguard_cache/,\
                proguard_cache_conf/,\
-               lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar,\
+               lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar,\
                lib/asm-4.1.jar,\
                lib/guava-16.0.1.jar,\
-               lib/jartender_2.10-0.7-SNAPSHOT.jar,\
-               lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar,\
+               lib/jartender_2.11-0.7-SNAPSHOT.jar,\
+               lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar,\
                lib/proguard-base-4.10.jar,\
-               lib/scalaz-core_2.10-7.0.6.jar
+               lib/scalaz-core_2.11-7.0.6.jar,\
+               lib/scala-xml_2.11-1.0.1.jar,\
+               lib/scala-parser-combinators_2.11-1.0.1.jar,\
+               lib/scala-library_2.11-1.0.0.jar
 src.includes = \
                docs/,\
                src/,\

diff --git a/com.restphone.androidproguardscala.plugin/pom.xml b/com.restphone.androidproguardscala.plugin/pom.xml
@@ -30,7 +30,7 @@
     </dependency>
     <dependency>
       <groupId>com.restphone</groupId>
-      <artifactId>androidproguardscalalib_2.10</artifactId>
+      <artifactId>androidproguardscalalib_2.11</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
@@ -56,7 +56,7 @@
             </goals>
             <configuration>
               <outputDirectory>./lib</outputDirectory>
-              <includeArtifactIds>androidproguardscalalib_2.10,asm,guava,jartender_2.10,javasignatureparser_2.10,proguard-base,scalaz-core_2.10,jsr305</includeArtifactIds>
+              <includeArtifactIds>androidproguardscalalib_2.11,scala-library_2.11,scala-xml_2.11,scala-parser-combinators_2.11,asm,guava,jartender_2.11,javasignatureparser_2.11,proguard-base,scalaz-core_2.11,jsr305</includeArtifactIds>
             </configuration>
           </execution>
         </executions>