Skip to content
This repository was archived by the owner on Dec 1, 2017. It is now read-only.

Update gradle version and android library versions. #255

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: android

android:
components:
- build-tools-21.1.2
- android-21
- build-tools-23.0.1
- android-23
- extra-google-m2repository
- extra-android-m2repository
script: ./gradlew build
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.3.1'
}
}

8 changes: 4 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ repositories {
}

dependencies {
compile 'com.android.support:recyclerview-v7:21.0.0'
compile 'com.android.support:recyclerview-v7:23.0.1'
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 23
buildToolsVersion "23.0.1"
resourcePrefix 'twowayview_'

defaultConfig {
minSdkVersion 10
targetSdkVersion 21
targetSdkVersion 23
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,10 @@ boolean performItemLongClick(RecyclerView parent, View view, int position, long

return false;
}

@Override
public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -527,5 +527,10 @@ boolean performItemClick(RecyclerView parent, View view, int position, long id)
boolean performItemLongClick(RecyclerView parent, View view, int position, long id) {
return true;
}

@Override
public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {

}
}
}
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-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
8 changes: 4 additions & 4 deletions layouts/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ repositories {
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 23
buildToolsVersion "23.0.1"
resourcePrefix 'twowayview_'

defaultConfig {
minSdkVersion 10
targetSdkVersion 21
targetSdkVersion 23
}
}

dependencies {
compile project(':core')
compile 'com.android.support:recyclerview-v7:21.0.0'
compile 'com.android.support:recyclerview-v7:23.0.1'
}

apply from: "${rootDir}/gradle/scripts/gradle-mvn-push.gradle"
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ repositories {
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 23
buildToolsVersion "23.0.1"

defaultConfig {
minSdkVersion 10
targetSdkVersion 21
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
Expand All @@ -19,5 +19,5 @@ android {
dependencies {
compile project(':core')
compile project(':layouts')
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.android.support:appcompat-v7:23.0.1'
}