Skip to content

Commit e2cb57a

Browse files
f2prateekf2prateek
committed
Update Maven plugin and CI
1 parent a23f20a commit e2cb57a

21 files changed

Lines changed: 21 additions & 26 deletions

File tree

‎.travis.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
language: java
1+
language: android
22

3-
jdk: oraclejdk7
3+
android:
4+
components:
5+
- build-tools-20.0.0
6+
- android-16
7+
licenses:
8+
- android-sdk-license-5be876d5
9+
10+
jdk:
11+
- oraclejdk7
12+
- oraclejdk8
413

514
branches:
615
except:
@@ -9,16 +18,8 @@ branches:
918
notifications:
1019
email: false
1120

12-
before_install:
13-
# Install base Android SDK
14-
- sudo apt-get update -qq
15-
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
16-
- wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
17-
- tar xzf android-sdk_r22.3-linux.tgz
18-
- export ANDROID_HOME=$PWD/android-sdk-linux
19-
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
20-
21-
# Install required components.
22-
- echo yes | android update sdk -a -t platform-tools,build-tools-19.0.0,android-19 --no-ui --force > /dev/null
21+
sudo: false
2322

24-
script: mvn verify
23+
cache:
24+
directories:
25+
- $HOME/.m2

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@
102102
</plugin>
103103

104104
<plugin>
105-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
105+
<groupId>com.simpligility.maven.plugins</groupId>
106106
<artifactId>android-maven-plugin</artifactId>
107-
<version>3.8.1</version>
107+
<version>4.1.1</version>
108108
<configuration>
109109
<sdk>
110110
<platform>${android.platform}</platform>

‎progressbutton-samples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<build>
3232
<plugins>
3333
<plugin>
34-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
34+
<groupId>com.simpligility.maven.plugins</groupId>
3535
<artifactId>android-maven-plugin</artifactId>
3636
<extensions>true</extensions>
3737
</plugin>

progressbutton-samples/AndroidManifest.xml renamed to progressbutton-samples/src/main/AndroidManifest.xml

File renamed without changes.

progressbutton-samples/res/drawable-hdpi/icon.png renamed to progressbutton-samples/src/main/res/drawable-hdpi/icon.png

File renamed without changes.

progressbutton-samples/res/layout/activity_main.xml renamed to progressbutton-samples/src/main/res/layout/activity_main.xml

File renamed without changes.

progressbutton-samples/res/values/colors.xml renamed to progressbutton-samples/src/main/res/values/colors.xml

File renamed without changes.

progressbutton-samples/res/values/strings.xml renamed to progressbutton-samples/src/main/res/values/strings.xml

File renamed without changes.

progressbutton-samples/res/values/styles.xml renamed to progressbutton-samples/src/main/res/values/styles.xml

File renamed without changes.

‎progressbutton/AndroidManifest.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)