Skip to content

Update build.gradle #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 17, 2017
Merged

Update build.gradle #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
83d367d
Update build.gradle
NeilMajumder Jun 17, 2017
4544df7
Update build.gradle
NeilMajumder Jun 19, 2017
4c32d21
Update build.gradle
NeilMajumder Jun 20, 2017
b296636
Update gradle.properties
NeilMajumder Jun 20, 2017
88e4d89
Update gradle.properties
NeilMajumder Jun 20, 2017
1be3593
Update gradle.properties
NeilMajumder Jun 20, 2017
cf9108c
Update build.gradle
NeilMajumder Jun 20, 2017
b95f31d
Update gradle-wrapper.properties
NeilMajumder Jun 20, 2017
96677b6
Update .travis.yml
NeilMajumder Jun 20, 2017
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android:
- platform-tools
- extra-android-m2repository
- extra-google-m2repository
- build-tools-23.0.3
- android-23
- build-tools-26.0.0
- android-26

# Enable travis container based infrastructure
sudo: false
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.3.2'
}
}

Expand All @@ -23,6 +23,6 @@ allprojects {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.13'
gradleVersion = '3.3'
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
}
10 changes: 5 additions & 5 deletions demo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.0"

lintOptions {
abortOnError false
}

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
targetSdkVersion 26
}
}

dependencies {
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-v4:26.0.0-alpha1'
compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
compile project(':library')
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION_NAME=3.3.1
VERSION_CODE=16
GROUP=com.sothree.slidinguppanel
GROUP=com.umano.slidinguppanel

POM_DESCRIPTION=Android Sliding Up Panel Library
POM_URL=https://github.com/umano/AndroidSlidingUpPanel
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-2.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
12 changes: 6 additions & 6 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ repositories {
}

dependencies {
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:support-annotations:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:support-v4:26.0.0-alpha1'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to avoid alpha libraries. If you change this to a stable version like 25, i'll merge. Thank you!

compile 'com.android.support:support-annotations:26.0.0-alpha1'
compile 'com.android.support:recyclerview-v7:26.0.0-alpha1'
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.0"
lintOptions {
abortOnError false
}
}

apply from: '../maven_push.gradle'
apply from: '../maven_push.gradle'