Skip to content

Commit

Permalink
Tidy, removing RoboGuice & other unused stuff, version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
rtyley committed Mar 14, 2012
1 parent 1d85ffb commit 4284150
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 86 deletions.
1 change: 0 additions & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
android:versionName="1.0">
<uses-sdk android:minSdkVersion="7" />
<application
android:name="com.madgag.ssh.toysshagent.ToySshAgentApplication"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:debuggable="true">
Expand Down
25 changes: 5 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
<version>0.3.1</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -94,16 +94,6 @@
<artifactId>scprov-jdk15</artifactId>
<version>1.46.99.3-UNOFFICIAL-ROBERTO-RELEASE</version>
</dependency>
<dependency>
<groupId>org.roboguice</groupId>
<artifactId>roboguice</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0-no_aop</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -117,23 +107,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<target>1.5</target>
<source>1.5</source>
<target>1.6</target>
<source>1.6</source>
</configuration>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>maven-android-plugin</artifactId>
<version>2.9.0-beta-2</version>
<artifactId>android-maven-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<sdk>
<path>${user.home}/android-sdk/</path>
<platform>8</platform>
</sdk>
<emulator>
<avd>22</avd>
</emulator>
<deleteConflictingFiles>true</deleteConflictingFiles>
<extractDuplicates>true</extractDuplicates>
</configuration>
<extensions>true</extensions>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/madgag/ssh/toysshagent/SshUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.security.PublicKey;
import java.security.Security;

import net.schmizz.sshj.common.Buffer;
import net.schmizz.sshj.common.Buffer.PlainBuffer;
import net.schmizz.sshj.common.KeyType;

Expand All @@ -38,7 +39,7 @@ public class SshUtil {
Security.addProvider(new BouncyCastleProvider());
}

public PublicKey sshDecode(byte[] bytes) {
public PublicKey sshDecode(byte[] bytes) throws Buffer.BufferException {
return new PlainBuffer(bytes).readPublicKey();
}

Expand Down

This file was deleted.

32 changes: 0 additions & 32 deletions src/main/java/com/madgag/ssh/toysshagent/ToySshAgentModule.java

This file was deleted.

0 comments on commit 4284150

Please sign in to comment.