Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit

Permalink
Update to Android SDK 12.0.1 (#136)
Browse files Browse the repository at this point in the history
  • Loading branch information
samtstern authored Apr 4, 2018
1 parent 02f0557 commit 518c09e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android:
- tools
- tools
- platform-tools
- android-26
- build-tools-26.0.1
- android-27
- build-tools-27.0.2
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
Expand All @@ -22,7 +22,7 @@ cache:
- "$HOME/.android/build-cache"
before_script:
- echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --channel=3 "tools" "platform-tools"
"build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
"build-tools;27.0.2" "platforms;android-27" "extras;google;m2repository"
script: "./build.sh"
java/service-account:
json:
Expand Down
25 changes: 14 additions & 11 deletions android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<plugin>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>4.3.0</version> <!-- use latest release -->
<version>4.5.0</version> <!-- use latest release -->
<configuration>
<sdk>
<platform>26</platform>
<platform>27</platform>
</sdk>
</configuration>
<extensions>true</extensions>
Expand All @@ -60,18 +60,14 @@
</build>

<repositories>
<repository>
<id>google-extras</id>
<url>file://${env.ANDROID_HOME}/extras/google/m2repository</url>
</repository>
<repository>
<id>android-extras</id>
<url>file://${env.ANDROID_HOME}/extras/android/m2repository</url>
</repository>
<repository>
<id>google-maven</id>
<url>https://maven.google.com</url>
</repository>
<repository>
<id>jcenter</id>
<url>https://jcenter.bintray.com</url>
</repository>
</repositories>
<dependencies>
<dependency>
Expand All @@ -83,7 +79,14 @@
<dependency>
<groupId>com.google.firebase</groupId>
<artifactId>firebase-database</artifactId>
<version>11.4.0</version>
<version>12.0.1</version>
<scope>provided</scope>
<type>aar</type>
</dependency>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>support-v4</artifactId>
<version>27.1.0</version>
<scope>provided</scope>
<type>aar</type>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ else
fi

# Build
mvn clean compile test-compile
mvn -e clean compile test-compile

# Run unit tests
mvn test
mvn -e test

# Only run test suite when we can decode the service acct
if [ "$TRAVIS_SECURE_ENV_VARS" = false ]; then
Expand Down

0 comments on commit 518c09e

Please sign in to comment.