Skip to content

Commit fcb7eaa

Browse files
committed
updated to use Maven 3.6.1 for IT tests, reactivated some
1 parent 98e3e9f commit fcb7eaa

11 files changed

+14
-19
lines changed

src/test/java/com/simpligility/maven/plugins/android/sample/AarActionbarsherlockExampleSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.simpligility.maven.plugins.android.PluginInfo;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class AarActionbarsherlockExampleSampleIT {
3636

3737
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/ApiDemosSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.simpligility.maven.plugins.android.PluginInfo;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class ApiDemosSampleIT {
3636

3737
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/ApkWithProvidedJarBuildExampleIT.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package com.simpligility.maven.plugins.android.sample;
2121

22-
2322
import io.takari.maven.testing.TestResources;
2423
import io.takari.maven.testing.executor.MavenExecutionResult;
2524
import io.takari.maven.testing.executor.MavenRuntime;
@@ -29,15 +28,14 @@
2928

3029
import java.io.File;
3130

32-
import org.junit.Ignore;
3331
import org.junit.Rule;
3432
import org.junit.Test;
3533
import org.junit.runner.RunWith;
3634

3735
import com.simpligility.maven.plugins.android.PluginInfo;
3836

3937
@RunWith(MavenJUnitTestRunner.class)
40-
@MavenVersions({"3.3.9"})
38+
@MavenVersions({"3.6.1"})
4139
public class ApkWithProvidedJarBuildExampleIT {
4240

4341
@Rule
@@ -48,8 +46,7 @@ public class ApkWithProvidedJarBuildExampleIT {
4846
public ApkWithProvidedJarBuildExampleIT(MavenRuntimeBuilder builder) throws Exception {
4947
this.mavenRuntime = builder.build();
5048
}
51-
52-
@Ignore
49+
5350
@Test
5451
public void buildInstall() throws Exception {
5552
File basedir = resources.getBasedir( "aar-child" );

src/test/java/com/simpligility/maven/plugins/android/sample/BuildConfigInjectionSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.simpligility.maven.plugins.android.PluginInfo;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class BuildConfigInjectionSampleIT {
3636

3737
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/HelloFlashLightSampleIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.io.File;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.0.5", "3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class HelloFlashLightSampleIT {
3636

3737
@Rule
@@ -43,7 +43,6 @@ public HelloFlashLightSampleIT(MavenRuntimeBuilder builder) throws Exception {
4343
this.mavenRuntime = builder.build();
4444
}
4545

46-
@Ignore
4746
@Test
4847
public void buildDeployAndRun() throws Exception {
4948
File basedir = resources.getBasedir( "helloflashlight" );

src/test/java/com/simpligility/maven/plugins/android/sample/Junit4TestBuildExampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939

4040
@RunWith(MavenJUnitTestRunner.class)
41-
@MavenVersions({"3.3.9"})
41+
@MavenVersions({"3.6.1"})
4242
public class Junit4TestBuildExampleIT {
4343

4444
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/LibraryProjectsSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.simpligility.maven.plugins.android.PluginInfo;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class LibraryProjectsSampleIT {
3636

3737
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/MorseflashSampleIT.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.simpligility.maven.plugins.android.PluginInfo;
3333

3434
@RunWith(MavenJUnitTestRunner.class)
35-
@MavenVersions({"3.3.9"})
35+
@MavenVersions({"3.6.1"})
3636
public class MorseflashSampleIT {
3737

3838
@Rule
@@ -43,8 +43,7 @@ public class MorseflashSampleIT {
4343
public MorseflashSampleIT(MavenRuntimeBuilder builder) throws Exception {
4444
this.mavenRuntime = builder.build();
4545
}
46-
47-
@Ignore
46+
4847
@Test
4948
public void buildDeployAndRun() throws Exception {
5049
File basedir = resources.getBasedir( "morseflash" );

src/test/java/com/simpligility/maven/plugins/android/sample/MultiDexSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.io.File;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class MultiDexSampleIT {
3636

3737
@Rule

src/test/java/com/simpligility/maven/plugins/android/sample/Support4DemosSampleIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.simpligility.maven.plugins.android.PluginInfo;
3232

3333
@RunWith(MavenJUnitTestRunner.class)
34-
@MavenVersions({"3.3.9"})
34+
@MavenVersions({"3.6.1"})
3535
public class Support4DemosSampleIT
3636
{
3737

0 commit comments

Comments
 (0)