Skip to content
This repository has been archived by the owner on Oct 3, 2024. It is now read-only.

Update deps #177

Merged
merged 3 commits into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ cache:
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache

before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
android:
components:
# https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
- tools
- tools
- platform-tools
- build-tools-26.0.1
- android-26

before_script: echo y | ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "platforms;android-27"
script: ./gradlew build

after_failure:
Expand Down
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion compileSdk
buildToolsVersion buildTools

defaultConfig {
applicationId "pub.devrel.easypermissions.sample"
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta6'
classpath 'com.android.tools.build:gradle:3.0.0'

classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
Expand Down Expand Up @@ -35,9 +35,8 @@ ext {

bintrayOrg = 'easygoogle'

support_library_version = '26.0.1'
support_library_version = '27.0.1'

buildTools = '26.0.1'
compileSdk = 26
targetSdk = 26
compileSdk = 27
targetSdk = 27
}
3 changes: 1 addition & 2 deletions easypermissions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion compileSdk
buildToolsVersion buildTools

defaultConfig {
minSdkVersion 14
Expand All @@ -25,7 +24,7 @@ dependencies {
api "com.android.support:support-fragment:$support_library_version"

testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.4.2'
testImplementation 'org.robolectric:robolectric:3.5.1'
}

apply from: 'maven.gradle'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Aug 18 16:20:16 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip