Merge pull request #1980 from iBotPeaches/windows

Windows Support for Travis

.travis.yml

@@ -1,28 +1,37 @@
 env:
-   - TERM=dumb GROOVY_TURN_OFF_JAVA_WARNINGS=true
+  global:
+    - TERM=dumb
+    - GROOVY_TURN_OFF_JAVA_WARNINGS=true
+
 language: java
+
 dist: trusty
+
 matrix:
   include:
     - os: linux
       jdk: openjdk8
-#    - os: linux
-#      jdk: openjdk9
     - os: linux
       jdk: oraclejdk8
-#    - os: linux
-#      jdk: oraclejdk9
     - os: osx
       osx_image: xcode9.2
-#    - os: osx
-#      osx_image: xcode9.4
+    - os: windows
+      language: shell
+  allow_failures:
+    - os: windows
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-install: ./gradlew clean
-script: ./gradlew build shadowJar proguard
+
+install:
+  - chmod +x ./scripts/travis-ci/clean-tests.sh
+  - ./scripts/travis-ci/clean-tests.sh
+
+script:
+  - chmod +x  ./scripts/travis-ci/run-tests.sh
+  - ./scripts/travis-ci/run-tests.sh
+
 branches:
   only:
-    - master
-    - stable
+    - master

brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java

@@ -241,7 +241,7 @@ public class BuildAndDecodeTest extends BaseTest {
     @Test
     public void qualifiersTest() throws BrutException {
         compareValuesFiles("values-mcc004-mnc4-en-rUS-ldrtl-sw100dp-w200dp-h300dp"
-                + "-xlarge-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key"
+                + "-long-round-highdr-land-desk-night-xhdpi-finger-keyssoft-12key"
                 + "-navhidden-dpad-v26/strings.xml");
     }
 

scripts/travis-ci/clean-tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+    choco install jdk8
+    export PATH=$PATH:"/c/Program Files/Java/jdk1.8.0_191/bin"
+    ./gradlew.bat clean
+else
+    ./gradlew clean
+fi
+
+exit $?

scripts/travis-ci/run-tests.sh

@@ -1,2 +1,10 @@
 #!/usr/bin/env sh
-./gradlew build shadowJar
+
+if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+    export PATH=$PATH:"/c/Program Files/Java/jdk1.8.0_191/bin"
+    ./gradlew.bat build shadowJar proguard
+else
+    ./gradlew build shadowJar proguard
+fi
+
+exit $?