diff --git a/README.md b/README.md
index a818ff8..fc910f1 100644
--- a/README.md
+++ b/README.md
@@ -352,14 +352,14 @@ Download
--------
Releases are available both in `jcenter` and `mavenCentral` repositories.
```groovy
-compile 'com.github.ivbaranov:rxbluetooth2:2.1.1'
+compile 'com.github.ivbaranov:rxbluetooth2:2.1.2'
```
| Branch | Artifact Id | Support library version | Latest version |
|:-------:|:-----------:|:------------------------:|:--------------:|
| [`rxjava-1.x`](https://github.com/IvBaranov/RxBluetooth/tree/rxjava-1.x) | `rxbluetooth` | 25.3.1 | 0.1.6 |
| [`rxjava-2.x`](https://github.com/IvBaranov/RxBluetooth/tree/rxjava-2.x) | `rxbluetooth2` | 25.3.1 | 2.0.4 |
-| [`rxjava-2.x`](https://github.com/IvBaranov/RxBluetooth/tree/rxjava-2.x) | `rxbluetooth2` | AndroidX | 2.1.1 |
+| [`rxjava-2.x`](https://github.com/IvBaranov/RxBluetooth/tree/rxjava-2.x) | `rxbluetooth2` | AndroidX | 2.1.2 |
#### Snapshots
diff --git a/build.gradle b/build.gradle
index 9c00a36..4fc157d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,10 @@ buildscript {
repositories {
google()
mavenCentral()
- jcenter()
}
dependencies {
- classpath "com.android.tools.build:gradle:$GRADLE_PLUGIN_VERSION"
- classpath "com.novoda:bintray-release:$BINTRAY_RELEASE"
+ classpath "com.android.tools.build:gradle:4.1.3"
+ classpath 'com.vanniktech:gradle-maven-publish-plugin:0.20.0'
}
}
@@ -14,7 +13,6 @@ allprojects {
repositories {
google()
mavenCentral()
- jcenter()
}
}
diff --git a/gradle.properties b/gradle.properties
index dad606e..e7c83e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,44 +1,49 @@
# suppress inspection "UnusedProperty" for whole file
# Compile SDK version (SDK platform to compile with)
-COMPILE_SDK_VERSION=android-28
+COMPILE_SDK_VERSION=android-31
# Minimum SDK version (lowest SDK platform to target)
MIN_SDK_VERSION=14
# Target SDK version (highest SDK platform to target)
-TARGET_SDK_VERSION=28
+TARGET_SDK_VERSION=31
# Current library version
-VERSION_NAME=2.1.1
-VERSION_CODE=21
+VERSION_NAME=2.1.2
+VERSION_CODE=22
# Dependency versions (library)
RXANDROID_VERSION=2.1.0
-RXJAVA_VERSION=2.2.5
-ANDROIDX_ANNOTATION_VERSION=1.0.1
-ANDROIDX_APPCOMPAT_VERSION=1.0.0
+RXJAVA_VERSION=2.2.9
+ANDROIDX_ANNOTATION_VERSION=1.2.0
+ANDROIDX_APPCOMPAT_VERSION=1.3.1
ANDROIDX_FRAGMENT_VERSION=1.2.0-rc05
# Dependency versions (plugins)
-GRADLE_PLUGIN_VERSION=3.3.0
-BINTRAY_RELEASE=0.9
+GRADLE_PLUGIN_VERSION=4.1.3
+
+android.useAndroidX=true
+android.enableJetifier=false
# Maven
USER_ORG=ivbaranov
+SONATYPE_HOST=DEFAULT
+RELEASE_SIGNING_ENABLED=true
GROUP=com.github.ivbaranov
-ARTIFACT_ID=rxbluetooth2
-
-android.useAndroidX=true
-android.enableJetifier=false
POM_DESCRIPTION=Android reactive bluetooth
+POM_INCEPTION_YEAR=2022
POM_URL=https://github.com/ivbaranov/RxBluetooth
+
+POM_LICENSE_NAME=The Apache Software License, Version 2.0
+POM_LICENSE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENSE_DIST=repo
+
POM_SCM_URL=https://github.com/ivbaranov/RxBluetooth
POM_SCM_CONNECTION=scm:git@github.com:ivbaranov/RxBluetooth.git
POM_SCM_DEV_CONNECTION=scm:git@github.com:ivbaranov/RxBluetooth.git
-POM_LICENCE_NAME=Apache-2.0
-POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
+
POM_DEVELOPER_ID=ivbaranov
-POM_DEVELOPER_NAME=Ivan Baranov
\ No newline at end of file
+POM_DEVELOPER_NAME=Ivan Baranov
+POM_DEVELOPER_URL=https://github.com/ivbaranov/
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e97471..3a2c678 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Jul 04 17:54:05 MSK 2022
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/rxbluetooth/build.gradle b/rxbluetooth/build.gradle
index 2302674..43d3991 100644
--- a/rxbluetooth/build.gradle
+++ b/rxbluetooth/build.gradle
@@ -1,5 +1,5 @@
apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
+apply plugin: "com.vanniktech.maven.publish"
android {
compileSdkVersion COMPILE_SDK_VERSION
@@ -22,15 +22,3 @@ dependencies {
api "io.reactivex.rxjava2:rxjava:$RXJAVA_VERSION"
api "io.reactivex.rxjava2:rxandroid:$RXANDROID_VERSION"
}
-
-publish {
- userOrg = USER_ORG
- groupId = GROUP
- artifactId = ARTIFACT_ID
- publishVersion = VERSION_NAME
- desc = POM_DESCRIPTION
- licences = [POM_LICENCE_NAME]
- website = POM_URL
-}
-
-apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
diff --git a/rxbluetooth/src/main/AndroidManifest.xml b/rxbluetooth/src/main/AndroidManifest.xml
index ed345b0..6e6e8c2 100644
--- a/rxbluetooth/src/main/AndroidManifest.xml
+++ b/rxbluetooth/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
package="com.example.ivbaranov.rxbluetooth2">
+