Skip to content

Commit

Permalink
Merge pull request #417 from square/jw/2017-02-02/kill-maven-plugin-a…
Browse files Browse the repository at this point in the history 
…nd-sample

Remove Maven plugin and the sample app/tests.
  • Loading branch information
@JakeWharton
JakeWharton authored Feb 3, 2017
2 parents d3d1f59 + 52c2c37 commit 6a6940c
Show file tree
Hide file tree
Showing 59 changed files with 16 additions and 3,441 deletions.
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ android:
- android-16

jdk:
- oraclejdk7
- oraclejdk8

after_success:
Expand Down
95 changes: 6 additions & 89 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>com.squareup.spoon</groupId>
<artifactId>parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spoon (Parent)</name>
Expand Down Expand Up @@ -45,19 +45,11 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<java.version>1.6</java.version>
</properties>

<modules>
<module>spoon-client</module>
<module>spoon-maven-plugin</module>
<module>spoon-runner</module>
<!--
Uncomment this if you want to run the sample locally. It `mvn install`s fine, but breaks on
`mvn package`.
-->
<!--<module>spoon-sample</module>-->
</modules>

<dependencyManagement>
Expand All @@ -70,7 +62,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -82,20 +74,15 @@
<artifactId>android</artifactId>
<version>4.1.1.4</version>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
<version>4.1.1.4</version>
</dependency>
<dependency>
<groupId>com.android.tools.ddms</groupId>
<artifactId>ddmlib</artifactId>
<version>25.1.2</version>
<version>25.2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
Expand All @@ -110,101 +97,31 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<version>3.2</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.madgag</groupId>
<artifactId>animated-gif-lib</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>annotations</artifactId>
<version>12.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.8</version>
</dependency>
<dependency>
<groupId>com.actionbarsherlock</groupId>
<artifactId>actionbarsherlock</artifactId>
<version>4.4.0</version>
<type>apklib</type>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
<version>21.0</version>
</dependency>
<dependency>
<groupId>org.lesscss</groupId>
<artifactId>lesscss</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>com.jayway.android.robotium</groupId>
<artifactId>robotium-solo</artifactId>
<version>5.1</version>
</dependency>
<dependency>
<groupId>com.squareup</groupId>
<artifactId>fest-android</artifactId>
<version>1.0.7</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>4.1.1</version>
<configuration>
<sdk>
<platform>19</platform>
</sdk>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.2</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
Expand Down
6 changes: 5 additions & 1 deletion spoon-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
<parent>
<groupId>com.squareup.spoon</groupId>
<artifactId>parent</artifactId>
<version>1.7.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>spoon-client</artifactId>
<name>Spoon Client Library</name>

<properties>
<java.version>1.6</java.version>
</properties>

<dependencies>
<dependency>
<groupId>com.google.android</groupId>
Expand Down
53 changes: 0 additions & 53 deletions spoon-maven-plugin/pom.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions spoon-maven-plugin/src/main/java/com/squareup/spoon/mojo/AbstractSpoonMojo.java
View file

This file was deleted.

32 changes: 0 additions & 32 deletions spoon-maven-plugin/src/main/java/com/squareup/spoon/mojo/OpenMojo.java
View file

This file was deleted.

Loading

0 comments on commit 6a6940c

Please sign in to comment.