Skip to content

Commit f1ddbcb

Browse files
authored
Build system and dependency updates
1 parent d32ba39 commit f1ddbcb

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

build.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
subprojects {
2-
buildscript {
3-
repositories {
4-
google()
5-
mavenCentral()
6-
jcenter()
7-
}
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.6.0-rc03'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
11-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
12-
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
13-
}
1+
buildscript {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
jcenter()
6+
}
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:4.1.1'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
10+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
11+
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
1412
}
13+
}
1514

15+
allprojects {
1616
repositories {
1717
google()
1818
mavenCentral()
@@ -22,6 +22,6 @@ subprojects {
2222

2323
ext {
2424
minSdkVersion = 9
25-
compileSdkVersion = 29
25+
compileSdkVersion = 30
2626
sourceCompatibility = JavaVersion.VERSION_1_8
2727
}

gradle.properties

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
android.enableJetifier=false
2+
android.useAndroidX=true
3+
org.gradle.jvmargs=-Xmx2048m
4+
15
GROUP=io.reactivex.rxjava3
26
VERSION_NAME=3.0.1
37
POM_NAME=RxAndroid
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

rxandroid/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ android {
3636
}
3737

3838
dependencies {
39-
api 'io.reactivex.rxjava3:rxjava:3.0.3'
39+
api 'io.reactivex.rxjava3:rxjava:3.0.8'
4040

41-
testImplementation 'junit:junit:4.13'
42-
testImplementation 'org.robolectric:robolectric:3.8'
41+
testImplementation 'junit:junit:4.13.1'
42+
testImplementation 'org.robolectric:robolectric:4.2.1'
4343
}
4444

4545
// Create source/javadoc artifacts for publishing

sample-app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android {
55

66
defaultConfig {
77
minSdkVersion 15
8-
targetSdkVersion 28
8+
targetSdkVersion 30
99
versionCode 1
1010
versionName '1.0'
1111
}

0 commit comments

Comments
 (0)