Skip to content
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android:
- tools
- platform-tools
- android-26
- build-tools-26.0.1
- build-tools-26.0.2

# as per http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/
sudo: false
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ subprojects {
repositories {
mavenCentral()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1'
}
}

Expand All @@ -17,6 +21,6 @@ subprojects {
ext {
minSdkVersion = 9
compileSdkVersion = 26
buildToolsVersion = '26.0.1'
buildToolsVersion = '26.0.2'

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Required for AGP 3.x

sourceCompatibility = JavaVersion.VERSION_1_7
}
14 changes: 3 additions & 11 deletions rxandroid/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
buildscript {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1"
}
}

apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
Expand Down Expand Up @@ -40,10 +32,10 @@ android {
}

dependencies {
compile 'io.reactivex.rxjava2:rxjava:2.0.1'
api 'io.reactivex.rxjava2:rxjava:2.0.1'

testCompile 'junit:junit:4.12'
testCompile 'org.robolectric:robolectric:3.1.2'
testImplementation 'junit:junit:4.12'
testImplementation 'org.robolectric:robolectric:3.1.2'
}

// Create source/javadoc artifacts for publishing
Expand Down
2 changes: 1 addition & 1 deletion sample-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ android {
}

dependencies {
compile project(':rxandroid')
implementation project(':rxandroid')
}