Skip to content

Commit 666f6b9

Browse files
committed
3.0.0 release
1 parent b46d91d commit 666f6b9

File tree

6 files changed

+40
-45
lines changed

6 files changed

+40
-45
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# RxDatabindings
22
[![Download](https://api.bintray.com/packages/step-89-g/stepango/rxDataBindings/images/download.svg) ](https://bintray.com/step-89-g/stepango/rxDataBindings/_latestVersion)
33

4-
RxJava2 extensions for Android Databindings library
4+
RxJava 2 & 3 extensions for Android Databindings library
55

66
Add RxDataBindings to your build.gradle
7-
```
8-
implementation "com.stepango.rxdatabindings:rxdatabindings:2.0.0"
7+
```groovy
8+
implementation "com.stepango.rxdatabindings:rxdatabindings:3.0.0"
99
```
1010

1111
Basic example of usage:

WORKSPACE

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3-
RULES_JVM_EXTERNAL_TAG = "2.7"
4-
RULES_JVM_EXTERNAL_SHA = "f04b1466a00a2845106801e0c5cec96841f49ea4e7d1df88dc8e4bf31523df74"
3+
RULES_JVM_EXTERNAL_TAG = "3.0"
4+
RULES_JVM_EXTERNAL_SHA = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a"
55

66
http_archive(
77
name = "rules_jvm_external",
@@ -12,13 +12,13 @@ http_archive(
1212

1313
load("@rules_jvm_external//:defs.bzl", "maven_install")
1414

15-
android_plugin_version = "3.5.1"
16-
rx_java_version = "2.2.12"
15+
android_plugin_version = "3.6.1"
16+
rx_java_version = "3.0.0"
1717
junit_version = "4.12"
1818

1919
maven_install(
2020
artifacts = [
21-
"io.reactivex.rxjava2:rxjava:" + rx_java_version,
21+
"io.reactivex.rxjava3:rxjava:" + rx_java_version,
2222
"androidx.databinding:databinding-common:" + android_plugin_version,
2323
"androidx.databinding:databinding-runtime:" + android_plugin_version ,
2424
"junit:junit:" + junit_version,
@@ -30,8 +30,6 @@ maven_install(
3030
],
3131
)
3232

33-
34-
3533
# Configure Android SDK Path
3634

3735
http_archive(
@@ -49,8 +47,8 @@ android_sdk_repository(
4947

5048
# Kotlin rules
5149

52-
rules_kotlin_version = "legacy-modded-1_0_0-01"
53-
rules_kotlin_sha = "b7984b28e0a1e010e225a3ecdf0f49588b7b9365640af783bd01256585cbb3ae"
50+
rules_kotlin_version = "legacy-1.3.0"
51+
rules_kotlin_sha = "4fd769fb0db5d3c6240df8a9500515775101964eebdf85a3f9f0511130885fde"
5452
http_archive(
5553
name = "io_bazel_rules_kotlin",
5654
urls = ["https://github.com/cgruber/rules_kotlin/archive/%s.zip" % rules_kotlin_version],

app/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ plugins {
77

88
android {
99

10-
compileSdkVersion 28
10+
compileSdkVersion 29
1111

1212
defaultConfig {
1313
applicationId "com.stepango.example"
1414

1515
minSdkVersion 16
16-
targetSdkVersion 28
16+
targetSdkVersion 29
1717

1818
versionCode 1
1919
versionName "1.0"
@@ -28,20 +28,20 @@ android {
2828

2929
dataBinding.enabled = true
3030

31+
compileOptions {
32+
sourceCompatibility JavaVersion.VERSION_1_8
33+
targetCompatibility JavaVersion.VERSION_1_8
34+
}
35+
3136
}
3237

3338
androidExtensions {
3439
features = ["parcelize"]
3540
}
3641

3742
dependencies {
43+
implementation project(':lib')
3844

39-
implementation(
40-
project(':lib'),
41-
//"com.stepango.rxdatabindings:rxdatabindings:$release_version",
42-
43-
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
44-
"io.reactivex.rxjava3:rxjava:$rxJava_version",
45-
)
46-
45+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
46+
implementation "io.reactivex.rxjava3:rxjava:$rxJava_version"
4747
}

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
buildscript {
44

55
ext {
6-
release_version = '2.0.0'
7-
release_code = 12
6+
release_version = '3.0.0'
7+
release_code = 13
88

9-
kotlin_version = '1.3.50'
9+
kotlin_version = '1.3.71'
1010
rxJava_version = '3.0.0'
11-
android_plugin_version = '3.5.0'
11+
android_plugin_version = '3.6.1'
1212
}
1313

1414
repositories {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Mon Mar 30 17:04:20 OMST 2020
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

lib/build.gradle

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,25 @@ android {
1313
versionName "$release_version"
1414
}
1515

16-
buildTypes {
17-
release {
18-
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android.txt')
20-
}
16+
compileOptions {
17+
sourceCompatibility JavaVersion.VERSION_1_8
18+
targetCompatibility JavaVersion.VERSION_1_8
2119
}
2220
}
2321

2422
dependencies {
25-
compileOnly(
26-
"org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
27-
"io.reactivex.rxjava3:rxjava:$rxJava_version",
28-
"androidx.databinding:databinding-common:$android_plugin_version",
29-
"androidx.databinding:databinding-runtime:$android_plugin_version",
30-
)
3123

32-
testImplementation(
33-
"org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
34-
"io.reactivex.rxjava3:rxjava:$rxJava_version",
35-
"androidx.databinding:databinding-common:$android_plugin_version",
36-
"androidx.databinding:databinding-runtime:$android_plugin_version",
37-
"junit:junit:4.12",
38-
)
24+
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
25+
compileOnly "io.reactivex.rxjava3:rxjava:$rxJava_version"
26+
compileOnly "androidx.databinding:databinding-common:$android_plugin_version"
27+
compileOnly "androidx.databinding:databinding-runtime:$android_plugin_version"
28+
29+
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
30+
testImplementation "io.reactivex.rxjava3:rxjava:$rxJava_version"
31+
testImplementation "androidx.databinding:databinding-common:$android_plugin_version"
32+
testImplementation "androidx.databinding:databinding-runtime:$android_plugin_version"
33+
testImplementation "junit:junit:4.12"
34+
3935
}
4036

4137
apply plugin: 'maven-publish'

0 commit comments

Comments
 (0)