Skip to content

Commit

Permalink
Merge pull request #5 from jahirfiquitiva/patch-1
Browse files Browse the repository at this point in the history
Update dependencies versions
  • Loading branch information
StephenVinouze committed Feb 4, 2018
2 parents fa546fa + 929227e commit 163311d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ android:
components:
- tools
- platform-tools
- build-tools-26.0.1
- android-26
- build-tools-27.0.3
- android-27
- extra-android-m2repository

jdk: oraclejdk8
Expand All @@ -18,3 +18,6 @@ env:
script:
# By default Travis-ci executes './gradlew build connectedCheck' if no 'script:' section found.
- ./gradlew build

before_install:
- yes | sdkmanager "platforms;android-27"
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.1.50'
ext.kotlin_version = '1.2.21'
repositories {
jcenter()
maven { url 'https://maven.google.com' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=1.0.4
VERSION_NAME=1.0.5
VERSION_CODE=1
GROUP_ID=com.github.stephenvinouze
PACKAGING=aar

ANDROID_MIN_SDK_VERSION=11
ANDROID_BUILD_SDK_VERSION=26
ANDROID_BUILD_TOOLS_VERSION=26.0.1
ANDROID_BUILD_SDK_VERSION=27
ANDROID_BUILD_TOOLS_VERSION=27.0.3

POM_NAME=MaterialNumberPicker
POM_REPO=maven
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
2 changes: 1 addition & 1 deletion javasample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {
}
}

def appcompat_version = "26.0.2"
def appcompat_version = "27.0.2"

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
}
}

def appcompat_version = "26.0.2"
def appcompat_version = "27.0.2"

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
Expand Down

0 comments on commit 163311d

Please sign in to comment.