Skip to content

Commit 81f6758

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 1e2a4eb + db42165 commit 81f6758

File tree

3 files changed

+51
-10
lines changed

3 files changed

+51
-10
lines changed

.travis.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
language: android
2+
3+
branches:
4+
only:
5+
- master
6+
- /^v\d+\.\d+\.\d+$/
7+
8+
sudo: false
9+
10+
jdk:
11+
- oraclejdk8
12+
13+
android:
14+
components:
15+
- tools
16+
- platform-tools
17+
- build-tools-26.0.1
18+
- android-26
19+
- doc-26
20+
21+
cache:
22+
directories:
23+
- $HOME/.gradle
24+
- $HOME/.m2/repository
25+
26+
deploy:
27+
provider: script
28+
script: ./gradlew bintrayUpload
29+
skip_cleanup: true
30+
on:
31+
branch: master
32+
tags: true

build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
8+
79
dependencies {
810
classpath 'com.android.tools.build:gradle:2.3.3'
911
// https://inthecheesefactory.com/blog/how-to-upload-library-to-jcenter-maven-central-as-dependency/en
@@ -16,15 +18,16 @@ buildscript {
1618
allprojects {
1719
repositories {
1820
jcenter()
21+
google()
1922
}
2023
}
2124

2225
ext {
23-
compileSdkVersion = 25
24-
buildToolsVersion = "25.0.2"
25-
supportLibVersion = '25.2.0'
26+
compileSdkVersion = 26
27+
buildToolsVersion = "26.0.1"
28+
supportLibVersion = '26.0.2'
2629
minSdkVersion = 14
27-
targetSdkVersion = 25
30+
targetSdkVersion = 26
2831
}
2932

3033
task clean(type: Delete) {

nestedscrollcoordinatorlayout/build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: 'com.jfrog.bintray'
44

55
// Required by bintray
6-
version = '1.0.0'
6+
version = '1.0.1'
77
group = 'com.otaliastudios'
88

99
android {
@@ -70,13 +70,19 @@ install {
7070
}
7171
}
7272

73-
Properties props = new Properties()
74-
props.load(project.rootProject.file('local.properties').newDataInputStream())
73+
def bintrayUser = System.getenv("BINTRAY_USER")
74+
def bintrayKey = System.getenv("BINTRAY_KEY")
75+
if (bintrayKey == null) {
76+
Properties props = new Properties()
77+
props.load(project.rootProject.file('local.properties').newDataInputStream())
78+
bintrayUser = props.getProperty('bintray.user')
79+
bintrayKey = props.get('bintray.key')
80+
}
7581

7682
bintray {
7783
// https://github.com/bintray/gradle-bintray-plugin
78-
user = props.getProperty('bintray.user')
79-
key = props.get('bintray.key')
84+
user = bintrayUser
85+
key = bintrayKey
8086
configurations = ['archives']
8187
pkg {
8288
repo = 'android'
@@ -125,4 +131,4 @@ artifacts {
125131
}
126132

127133
// export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home
128-
// ./gradlew bintrayUpload
134+
// ./gradlew bintrayUpload

0 commit comments

Comments
 (0)