Skip to content

Commit

Permalink
Switch to Maven wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickfav committed Aug 6, 2018
1 parent 9322b42 commit d7714c9
Show file tree
Hide file tree
Showing 7 changed files with 478 additions and 27 deletions.
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar
45 changes: 24 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
# To let the CI execute the maven wrapper, use this command and push the change:
# git update-index --chmod=+x mvnw

sudo: required
language: java
install: true
jdk:
- oraclejdk8
- oraclejdk8

env:
global:
- secure: "pcYro8VvhBnkLS58FtK0VHYxP2PQEZR0f3pUONP2sqYiSM4UVampzrUklQS4d87FN9j1lhCEVKi+t9bdLukcqM56hx0dmJo5vjIb1YcLf/tegbdFOk
- secure: "pcYro8VvhBnkLS58FtK0VHYxP2PQEZR0f3pUONP2sqYiSM4UVampzrUklQS4d87FN9j1lhCEVKi+t9bdLukcqM56hx0dmJo5vjIb1YcLf/tegbdFOk
ERf9JPee5AelH+obs6rn3q2My2Brm17zNSzZteYDYRf0gn9r0a9UwQJPSbkH3uRKJ1I50TOi8X+bqXZh6is8R+O3ofYruB+Us3l5ajGxrMWh+iZJLCc2JsZeajZ5V
zMwDjfXrh4fxfhYww6RcUDF67CnKqvuVhFOzXKRUJonm+PPrQRSylIL6xj4fH0wgGIwfKG+TET83/s0D29ToAIgN2u6H1lecxDwvTtPoxFttgBZJ8uVtskekz+k3z
nQmByoRSsO3r9XPaD9G7CYYxzYj7/YNdIY2X1VPDiy41rKXvmKDdwfevhNQX35zR5ycVa+XS/Uhd9R+CbipFwmQwJQnkdmUMEzAkuVHXXBS3X2oI331QOyX0qhKKe
CYhbRXCdQFMhJ8rgIQM+D7ocWcIHfbgabW22pNn8WkcK+wg9N2+zszt1OkQcmKdd/A+8S25nmqbT6dy+OCaLxH2uglC4WMKKuYiDqhLQSE230P6ASVG9Fp98JZXWa
958LpYmoYVDtx8CKA5lMiy6kZmd+rIszinfEBNV707nvh/puFqDFOwQf5h7f8oz0foG/s="
- secure: "rchQ5Sq+uXGzFlPuVVFuwAEE3Y1yKRPfl2Qoq9V4xQYaY/IpYsHIVrYjLJh9ytnAqexEHoxcm3w+6dy0fp2A1GBdh9065P/7ANnXvZk2DCpGTTbFD8
- secure: "rchQ5Sq+uXGzFlPuVVFuwAEE3Y1yKRPfl2Qoq9V4xQYaY/IpYsHIVrYjLJh9ytnAqexEHoxcm3w+6dy0fp2A1GBdh9065P/7ANnXvZk2DCpGTTbFD8
EwOgBaD/lua6rJ7Tmpz6rWbWj8Yb6FGohcuVJk8zEsLChwyFddfXChkwUZfSi33b+R4AkWVEGl2L3kQX1zcNwGzIFZo8UFqgU4UH3HIkyeeG0GqcHRlIAgLQ2GxtX
NyzgNAPb6Pb2sgR4mxUJSTRswlPM5qh4naGTsQsX5ac6H1p1Ql3O+7fjSrTJWZYFcdhcVX1ZjZHtKlWkw1HBuyMcZ5NG8O/U0kmD30hqMVz72g6XOt+MO5GBjq/oa
WGc5aMpb4AXuErymkUnE/o+kVHLVSiXcjI5sMhMA4yKn3wiT4HhAMSTzURnBvWAU/QraKcBsR1NHGdTvbwDwojOvnrzlWUPsPxZILo4TnbHsYYFF+3oy9HoYaQkQ4
kBh7wWngEnz0jhd9LUwtBhKodF8fw9aPXLQM4jHro4/pQ8xVENBS1OMf5iCyDNbsgryCENGnmZlumEs6QdwTs/nK/uqetVL91uz5YOqk9NQYUuw/jcpkwt4IcgO79
BFCiy8ABTXXQibL4kwvt0tvC9e1GG4Hi6KWsnmmaRM1mO/UJ6XuKqoOUoSUuNpmqLcu1Y="

before_install:
- openssl aes-256-cbc -K $encrypted_b32b8095166d_key -iv $encrypted_b32b8095166d_iv -in keystore.jks.enc -out keystore.jks -d
- openssl aes-256-cbc -K $encrypted_b32b8095166d_key -iv $encrypted_b32b8095166d_iv -in keystore.jks.enc -out keystore.jks -d

#required for launch4j to run
before_script:
- sudo apt-get update
- sudo apt-get install libc6:i386 libstdc++6:i386
- sudo apt-get update
- sudo apt-get install libc6:i386 libstdc++6:i386

script:
- mvn clean install -X checkstyle:check
- ./mvnw clean install -X checkstyle:check

after_success:
- mvn test jacoco:report coveralls:report
- ./mvnw test jacoco:report coveralls:report

deploy:
- provider: releases
api_key:
secure: "Y43tHaZXsc1K+FT1C8MO3A9BnjqYmfySXoC9CDEZvR6bzV71+rP/1hk4h4sRGqD1S6b5K0+TdGrpfWa1Isf1XOtHSPjp5qMvsQ+suydMlVh6wCE2l08m747/9Cq2LKT+c7uxNgq8ySZwuCWyinXDQpwxS2FThbs09XNu8GSH6eg++BAGAuLAwWctuyY9xYw1R5RPPUCDziWQE45xHxOK/HE1LHs3X4843DBZlN2tpJlUbQgCzSBgy+KdaCU5jC1pxH+haKBKUsCqVQFPaBoZT2UQAP7XmwSD7pxjevAn5+j8KrRU2dlCKgHqlf9ZrqA1sfC+Hv4lAbPdPaLL7s+qhtPDQn5SoNdTLvG0nIh1hvsOmT+9mYWxD45Ujbib20CReicwSlQX3t+4jkQGIEawBpozjZMKWyWksA0WMDuXZwWkCp/GA44Bcjbb8fjJp4K70COtQziphLTl9BAfb24kLxCaJ83Vo60aAp03KUChk+u5q9jqFvl7n0DGoUqhfiYyguG3yBfNGoFDTbz39DRsaf9QGaxBkIaBemw77Q7PnZEuhDIShSPconWZBOZb1KSgIugPzw2SQp1PuFvZYNYd2yg6PvyNVjl1OMrFY5pwyeJHrcE/7rwNQTnA1QeINOn8WRNr/eUlMHeTvpj3DW/f6OhTdW3meVzWoCqG5fvGw1k="
file_glob: true
file:
- "target/uber-adb-tools-*.jar"
- "target/uadb.exe"
skip_cleanup: true
on:
branch: master
tags: true
- provider: releases
api_key:
secure: "Y43tHaZXsc1K+FT1C8MO3A9BnjqYmfySXoC9CDEZvR6bzV71+rP/1hk4h4sRGqD1S6b5K0+TdGrpfWa1Isf1XOtHSPjp5qMvsQ+suydMlVh6wCE2l08m747/9Cq2LKT+c7uxNgq8ySZwuCWyinXDQpwxS2FThbs09XNu8GSH6eg++BAGAuLAwWctuyY9xYw1R5RPPUCDziWQE45xHxOK/HE1LHs3X4843DBZlN2tpJlUbQgCzSBgy+KdaCU5jC1pxH+haKBKUsCqVQFPaBoZT2UQAP7XmwSD7pxjevAn5+j8KrRU2dlCKgHqlf9ZrqA1sfC+Hv4lAbPdPaLL7s+qhtPDQn5SoNdTLvG0nIh1hvsOmT+9mYWxD45Ujbib20CReicwSlQX3t+4jkQGIEawBpozjZMKWyWksA0WMDuXZwWkCp/GA44Bcjbb8fjJp4K70COtQziphLTl9BAfb24kLxCaJ83Vo60aAp03KUChk+u5q9jqFvl7n0DGoUqhfiYyguG3yBfNGoFDTbz39DRsaf9QGaxBkIaBemw77Q7PnZEuhDIShSPconWZBOZb1KSgIugPzw2SQp1PuFvZYNYd2yg6PvyNVjl1OMrFY5pwyeJHrcE/7rwNQTnA1QeINOn8WRNr/eUlMHeTvpj3DW/f6OhTdW3meVzWoCqG5fvGw1k="
file_glob: true
file:
- "target/uber-adb-tools-*.jar"
- "target/uadb.exe"
skip_cleanup: true
on:
branch: master
tags: true

cache:
directories:
- $HOME/.m2
- $HOME/.m2

notifications:
slack:
secure: "hp09fUWRqUe/OH8A2/9Tp7KO9v568UG3RW7NPBvQH4vpFKb7HMgP6p+r1x0QdiioapIva/Mntzsd1TM11kSzmWX8dTS9UqYBFMpdxEBu+CILu4ttiQwEVqcwt95Igl7ZtSgjJrn/Z/s2YsGNtU2RS1GrmCZLlpT7ym2ILlgtfx1PNkCHgTZlxk1hmtbFPk/CoC5eg2mUnyPw/ssP76vYvyWc6y3UrIFAkh5UFIK/74rOKsAEsHPOPwPKbISVM5YsM/TQz3018X4np1EjWwEgLIqYtn6CPsJdQHzSAGkwJ8gsLHKizezyj0/MW1DV/U0WQgsywqTPoDqIikrhWk7lPqdD5cHmJMVkkO1axCSu4pXbKfYd+NOGWBciRkpLqevpOjOvcgBg2MEY3mUxEb99Aq7WGaWzgYGqghgZoPHPawQ4dz5+oIBb5KN7sTaXhvDPYTZh6pzgm125Vsquc27b/mo9ma2bgjXI0MV7E2fkXN1oZXe9GxPYnWFK8WdlxA+t6kp5/9d/FTtIbTgdd2k0JRozV+n4j0Kq3pNLJCQ/cvJar+w/Xo9R/iixbHfBVOGIJv5Rk+DqUJFzKJ/95B+EOW5+1R/oyq4lrHBUDJHXIicDhepBWzbBoL+kV5zSrF+R03iLWUMineSOXJpvbJhC28+xE/GRQGImoaU6KgB6stw="
email: false
email: false
3 changes: 1 addition & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Releases

## v1.0.3

* update various dependencies and plugins
* use newer launch4J version, which should be compatible with Java 9/10
* switch to maven wrapper

## v1.0.2

* No-Arg install will try to reinstall the app (usage with just the apk without any arguments)
* Add MiB indicator to install command

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This should run on any Windows, Mac or Linux machine,

### Requirements

* JDK 7
* JDK 8
* [Android Debug Bridge (ADB)](https://developer.android.com/studio/command-line/adb.html) set in `PATH` or `ANDROID_HOME` is set (some default locations work also, see below)

## Download
Expand Down Expand Up @@ -328,13 +328,13 @@ If you want to skip jar signing just change the skip configuration in the

### Build with Maven

Use maven (3.1+) to create a jar including all dependencies
Use the Maven wrapper to create a jar including all dependencies

mvn clean package
mvnw clean package

## Tech Stack

* Java 7
* Java 8 (+ [errorprone](https://github.com/google/error-prone) static analyzer)
* Maven

# Credits
Expand Down
Loading

0 comments on commit d7714c9

Please sign in to comment.