Skip to content

Commit

Permalink
upgraded android sdk lib
Browse files Browse the repository at this point in the history
  • Loading branch information
mosabua committed Sep 18, 2014
1 parent 5d946d7 commit 3b49889
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -49,8 +49,8 @@
<powermock.version>1.5.2</powermock.version>

<!-- Attention - make sure that the tools version is the versions of the transitive dependencies of the builder version -->
<android.builder.version>0.12.2</android.builder.version>
<android.tools.version>23.0.2</android.tools.version>
<android.builder.version>0.13.0</android.builder.version>
<android.tools.version>23.1.0</android.tools.version>
</properties>

<scm>
Expand Down
Expand Up @@ -338,6 +338,18 @@ public boolean supportsFeature(HardwareFeature arg0) {
// TODO Auto-generated method stub
return false;
}

@Override
public List<String> getAbis() {
// TODO Auto-generated method stub
return null;
}

@Override
public int getDensity() {
// TODO Auto-generated method stub
return 0;
}


});
Expand Down
Expand Up @@ -17,7 +17,6 @@

import io.takari.maven.testing.TestResources;
import io.takari.maven.testing.executor.MavenExecutionResult;
import io.takari.maven.testing.executor.MavenInstallations;
import io.takari.maven.testing.executor.MavenRuntime;
import io.takari.maven.testing.executor.MavenVersions;
import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
Expand All @@ -38,21 +37,21 @@ public class ZipalignMojoIntegrationTest {
@Rule
public final TestResources resources = new TestResources();

public final MavenRuntime verifier;
public final MavenRuntime mavenRuntime;

public ZipalignMojoIntegrationTest(MavenRuntimeBuilder builder) throws Exception {
this.verifier = builder.build();
this.mavenRuntime = builder.build();
}

@Test
public void skipOnNonAndroidProject() throws Exception {
File basedir = resources.getBasedir( "non-android-project" );

MavenExecutionResult result = verifier
MavenExecutionResult result = mavenRuntime
.forProject(basedir)
// switch on debug logging
// .withCliOptions("-X")
.execute(PluginInfo.getQualifiedGoal( "zipalign" ) );
.execute(PluginInfo.getQualifiedGoal( "zipalign" ) );

result.assertErrorFreeLog();

Expand Down

0 comments on commit 3b49889

Please sign in to comment.