Skip to content

Commit edb5e46

Browse files
committed
2.11 support
1 parent 5180d63 commit edb5e46

4 files changed

Lines changed: 24 additions & 16 deletions

File tree

com.restphone.androidproguardscala.plugin/.classpath

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar" sourcepath="/AndroidProguardScalaLib"/>
3+
<classpathentry exported="true" kind="lib" path="lib/scala-library_2.11-1.0.0.jar"/>
4+
<classpathentry exported="true" kind="lib" path="lib/scala-parser-combinators_2.11-1.0.1.jar"/>
5+
<classpathentry exported="true" kind="lib" path="lib/scala-xml_2.11-1.0.1.jar"/>
6+
<classpathentry exported="true" kind="lib" path="lib/scalaz-core_2.11-7.0.6.jar"/>
7+
<classpathentry exported="true" kind="lib" path="lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar"/>
48
<classpathentry exported="true" kind="lib" path="lib/asm-4.1.jar"/>
59
<classpathentry exported="true" kind="lib" path="lib/guava-16.0.1.jar"/>
6-
<classpathentry exported="true" kind="lib" path="lib/jartender_2.10-0.7-SNAPSHOT.jar"/>
7-
<classpathentry exported="true" kind="lib" path="lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar"/>
10+
<classpathentry exported="true" kind="lib" path="lib/jartender_2.11-0.7-SNAPSHOT.jar"/>
11+
<classpathentry exported="true" kind="lib" path="lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar"/>
812
<classpathentry exported="true" kind="lib" path="lib/proguard-base-4.10.jar"/>
9-
<classpathentry exported="true" kind="lib" path="lib/scalaz-core_2.10-7.0.6.jar"/>
1013
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
1114
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
1215
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

com.restphone.androidproguardscala.plugin/META-INF/MANIFEST.MF

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@ Bundle-Version: 0.0.51.qualifier
77
Require-Bundle: org.eclipse.core.resources,
88
org.eclipse.core.runtime,
99
org.eclipse.ui,
10-
org.eclipse.jdt.core;bundle-version="3.6.2",
11-
org.scala-ide.scala.library
10+
org.eclipse.jdt.core;bundle-version="3.6.2"
1211
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
1312
Export-Package: com.restphone.androidproguardscala
1413
Bundle-ClassPath: target/classes/,
1514
.,
16-
lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar,
15+
lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar,
1716
lib/asm-4.1.jar,
1817
lib/guava-16.0.1.jar,
19-
lib/jartender_2.10-0.7-SNAPSHOT.jar,
20-
lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar,
18+
lib/jartender_2.11-0.7-SNAPSHOT.jar,
19+
lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar,
2120
lib/proguard-base-4.10.jar,
22-
lib/scalaz-core_2.10-7.0.6.jar
21+
lib/scalaz-core_2.11-7.0.6.jar,
22+
lib/scala-xml_2.11-1.0.1.jar,
23+
lib/scala-parser-combinators_2.11-1.0.1.jar,
24+
lib/scala-library_2.11-1.0.0.jar
2325
Bundle-ActivationPolicy: lazy

com.restphone.androidproguardscala.plugin/build.properties

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ bin.includes = plugin.xml,\
77
COPYING,\
88
proguard_cache/,\
99
proguard_cache_conf/,\
10-
lib/androidproguardscalalib_2.10-0.6-SNAPSHOT.jar,\
10+
lib/androidproguardscalalib_2.11-0.6-SNAPSHOT.jar,\
1111
lib/asm-4.1.jar,\
1212
lib/guava-16.0.1.jar,\
13-
lib/jartender_2.10-0.7-SNAPSHOT.jar,\
14-
lib/javasignatureparser_2.10-0.7-SNAPSHOT.jar,\
13+
lib/jartender_2.11-0.7-SNAPSHOT.jar,\
14+
lib/javasignatureparser_2.11-0.7-SNAPSHOT.jar,\
1515
lib/proguard-base-4.10.jar,\
16-
lib/scalaz-core_2.10-7.0.6.jar
16+
lib/scalaz-core_2.11-7.0.6.jar,\
17+
lib/scala-xml_2.11-1.0.1.jar,\
18+
lib/scala-parser-combinators_2.11-1.0.1.jar,\
19+
lib/scala-library_2.11-1.0.0.jar
1720
src.includes = \
1821
docs/,\
1922
src/,\

com.restphone.androidproguardscala.plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dependency>
3131
<dependency>
3232
<groupId>com.restphone</groupId>
33-
<artifactId>androidproguardscalalib_2.10</artifactId>
33+
<artifactId>androidproguardscalalib_2.11</artifactId>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.ow2.asm</groupId>
@@ -56,7 +56,7 @@
5656
</goals>
5757
<configuration>
5858
<outputDirectory>./lib</outputDirectory>
59-
<includeArtifactIds>androidproguardscalalib_2.10,asm,guava,jartender_2.10,javasignatureparser_2.10,proguard-base,scalaz-core_2.10,jsr305</includeArtifactIds>
59+
<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>
6060
</configuration>
6161
</execution>
6262
</executions>

0 commit comments

Comments
 (0)