Merge pull request #1866 from iBotPeaches/issue-1864

feat: update internal freamwork to API 28 (Android Pie Final)
2024-06-01 19:06:23 +02:00 · 2018-08-17 17:19:44 -04:00 · 2018-08-17 17:19:44 -04:00 · 9e9eb9bcff
commit 9e9eb9bcff
parent 6231edfcfd 5d671c47ad
4 changed files with 4 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -15,6 +15,7 @@ matrix:
      dist: trusty
      jdk: openjdk8
    - os: osx
+      osx_image: xcode9.2
  allow_failures:
    - jdk: openjdk7
 cache:
@ -26,4 +27,4 @@ script: ./gradlew build shadowJar proguard
 branches:
  only:
    - master
-    - stable
+    - stable
--- a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
+++ b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Mon Jul 03 07:09:45 EDT 2017
+#Thu Aug 16 07:13:34 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip