diff --git a/README.md b/README.md
index 3980d7b80..259782e71 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ Complete usage examples are located in `/sample` [GitHub repo](https://github.co
### Gradle
```java
-compile "com.polidea.rxandroidble:rxandroidble:1.0.2"
+compile "com.polidea.rxandroidble:rxandroidble:1.1.0"
```
### Maven
@@ -194,7 +194,7 @@ compile "com.polidea.rxandroidble:rxandroidble:1.0.2"
com.polidea.rxandroidble
rxandroidble
- 1.0.2
+ 1.1.0
aar
```
diff --git a/build.gradle b/build.gradle
index e0bfaab7f..bbb74fd4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
- classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
+ classpath 'me.tatarka:gradle-retrolambda:3.3.1'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.1.0'
}
diff --git a/dependencies.gradle b/dependencies.gradle
index a9cfabe03..cf87e6820 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,5 @@
ext {
- supportVersion = '23.1.1'
+ supportVersion = '25.0.0'
buildToolsVersionVariable = "25.0.0"
sourceCompatibilityVersion = JavaVersion.VERSION_1_8
targetCompatibilityVersion = JavaVersion.VERSION_1_8
@@ -8,13 +8,13 @@ ext {
retrolambda : 'net.orfjackal.retrolambda:retrolambda:2.3.0',
support : "com.android.support:support-v4:$supportVersion",
support_annotations: "com.android.support:support-annotations:$supportVersion",
- rxjava : 'io.reactivex:rxjava:1.1.7',
+ rxjava : 'io.reactivex:rxjava:1.2.2',
rxandroid : 'io.reactivex:rxandroid:1.2.1',
junit : 'junit:junit:4.12',
- groovy : 'org.codehaus.groovy:groovy:2.4.6:grooid',
+ groovy : 'org.codehaus.groovy:groovy:2.4.7:grooid',
spock : ['org.spockframework:spock-core:1.0-groovy-2.4',
- 'cglib:cglib-nodep:3.2.1',
- 'org.objenesis:objenesis:2.2'],
+ 'cglib:cglib-nodep:3.2.4',
+ 'org.objenesis:objenesis:2.4'],
robospock : 'org.robospock:robospock:1.0.1'
]
diff --git a/gradle.properties b/gradle.properties
index 4c1f48514..fa7e8e53d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
GROUP=com.polidea.rxandroidble
-VERSION_NAME=1.1.0-SNAPSHOT
+VERSION_NAME=1.1.0
POM_DESCRIPTION=RxJava backed support for Bluetooth Low Energy in Android
diff --git a/mockrxandroidble/README.md b/mockrxandroidble/README.md
index bebda77aa..7161e2edb 100644
--- a/mockrxandroidble/README.md
+++ b/mockrxandroidble/README.md
@@ -40,7 +40,7 @@ Get MockRxAndroidBle via Maven:
com.polidea.rxandroidble
mockclient
- 1.0.2
+ 1.1.0
aar
```
@@ -48,7 +48,7 @@ Get MockRxAndroidBle via Maven:
or via Gradle
```groovy
-compile "com.polidea.rxandroidble:mockclient:1.0.2"'
+compile "com.polidea.rxandroidble:mockclient:1.1.0"'
```
### License
diff --git a/sample/build.gradle b/sample/build.gradle
index ac8d480e4..844a28740 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+ classpath 'me.tatarka:gradle-retrolambda:3.3.1'
}
}
@@ -43,12 +43,13 @@ configurations.all {
}
dependencies {
- compile 'com.android.support:appcompat-v7:23.2.1'
- compile group: 'com.polidea.rxandroidble', name: 'rxandroidble', version: '1.0.1', changing: false
- compile 'com.android.support:design:23.2.1'
- compile 'com.jakewharton:butterknife:7.0.1'
+ // compile group: 'com.polidea.rxandroidble', name: 'rxandroidble', version: '1.1.0', changing: false
+ compile project(path: ':rxandroidble')
+ compile "com.android.support:appcompat-v7:$rootProject.ext.buildToolsVersionVariable"
+ compile "com.android.support:design:$rootProject.ext.buildToolsVersionVariable"
+ compile 'com.jakewharton:butterknife:8.4.0'
compile rootProject.ext.libs.rxjava
compile rootProject.ext.libs.rxandroid
- compile 'com.trello:rxlifecycle:0.5.0'
- compile 'com.trello:rxlifecycle-components:0.5.0'
+ compile 'com.trello:rxlifecycle:1.0'
+ compile 'com.trello:rxlifecycle-components:1.0'
}
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanActivity.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanActivity.java
index eb5b62ab7..4f295bece 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanActivity.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanActivity.java
@@ -15,7 +15,7 @@
import com.polidea.rxandroidble.sample.R;
import com.polidea.rxandroidble.sample.SampleApplication;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.Subscription;
@@ -23,9 +23,9 @@
public class ScanActivity extends AppCompatActivity {
- @Bind(R.id.scan_toggle_btn)
+ @BindView(R.id.scan_toggle_btn)
Button scanToggleButton;
- @Bind(R.id.scan_results)
+ @BindView(R.id.scan_results)
RecyclerView recyclerView;
private RxBleClient rxBleClient;
private Subscription scanSubscription;
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanResultsAdapter.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanResultsAdapter.java
index 778638ee0..182dce190 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanResultsAdapter.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example1_scanning/ScanResultsAdapter.java
@@ -14,16 +14,16 @@
import java.util.Comparator;
import java.util.List;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
class ScanResultsAdapter extends RecyclerView.Adapter {
static class ViewHolder extends RecyclerView.ViewHolder {
- @Bind(android.R.id.text1)
+ @BindView(android.R.id.text1)
public TextView line1;
- @Bind(android.R.id.text2)
+ @BindView(android.R.id.text2)
public TextView line2;
public ViewHolder(View itemView) {
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java
index 03b64dd23..322a1d594 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example2_connection/ConnectionExampleActivity.java
@@ -13,22 +13,22 @@
import com.polidea.rxandroidble.sample.SampleApplication;
import com.trello.rxlifecycle.components.support.RxAppCompatActivity;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
-import static com.trello.rxlifecycle.ActivityEvent.DESTROY;
-import static com.trello.rxlifecycle.ActivityEvent.PAUSE;
+import static com.trello.rxlifecycle.android.ActivityEvent.DESTROY;
+import static com.trello.rxlifecycle.android.ActivityEvent.PAUSE;
public class ConnectionExampleActivity extends RxAppCompatActivity {
- @Bind(R.id.connection_state)
+ @BindView(R.id.connection_state)
TextView connectionStateView;
- @Bind(R.id.connect_toggle)
+ @BindView(R.id.connect_toggle)
Button connectButton;
- @Bind(R.id.autoconnect)
+ @BindView(R.id.autoconnect)
SwitchCompat autoConnectToggleSwitch;
private RxBleDevice bleDevice;
private Subscription connectionSubscription;
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/DiscoveryResultsAdapter.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/DiscoveryResultsAdapter.java
index 576908358..d86233cf3 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/DiscoveryResultsAdapter.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/DiscoveryResultsAdapter.java
@@ -17,7 +17,7 @@
import java.util.List;
import java.util.UUID;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
class DiscoveryResultsAdapter extends RecyclerView.Adapter {
@@ -39,9 +39,9 @@ static class AdapterItem {
static class ViewHolder extends RecyclerView.ViewHolder {
- @Bind(android.R.id.text1)
+ @BindView(android.R.id.text1)
public TextView line1;
- @Bind(android.R.id.text2)
+ @BindView(android.R.id.text2)
public TextView line2;
public ViewHolder(View itemView) {
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java
index c83d3d6fe..04fbc50d6 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example3_discovery/ServiceDiscoveryExampleActivity.java
@@ -15,18 +15,18 @@
import com.polidea.rxandroidble.sample.example4_characteristic.CharacteristicOperationExampleActivity;
import com.trello.rxlifecycle.components.support.RxAppCompatActivity;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.android.schedulers.AndroidSchedulers;
-import static com.trello.rxlifecycle.ActivityEvent.PAUSE;
+import static com.trello.rxlifecycle.android.ActivityEvent.PAUSE;
public class ServiceDiscoveryExampleActivity extends RxAppCompatActivity {
- @Bind(R.id.connect)
+ @BindView(R.id.connect)
Button connectButton;
- @Bind(R.id.scan_results)
+ @BindView(R.id.scan_results)
RecyclerView recyclerView;
private DiscoveryResultsAdapter adapter;
private RxBleDevice bleDevice;
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example4_characteristic/CharacteristicOperationExampleActivity.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example4_characteristic/CharacteristicOperationExampleActivity.java
index aa46c228c..4f01452f8 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example4_characteristic/CharacteristicOperationExampleActivity.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example4_characteristic/CharacteristicOperationExampleActivity.java
@@ -17,31 +17,31 @@
import java.util.UUID;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.Observable;
import rx.android.schedulers.AndroidSchedulers;
import rx.subjects.PublishSubject;
-import static com.trello.rxlifecycle.ActivityEvent.PAUSE;
+import static com.trello.rxlifecycle.android.ActivityEvent.PAUSE;
public class CharacteristicOperationExampleActivity extends RxAppCompatActivity {
public static final String EXTRA_CHARACTERISTIC_UUID = "extra_uuid";
- @Bind(R.id.connect)
+ @BindView(R.id.connect)
Button connectButton;
- @Bind(R.id.read_output)
+ @BindView(R.id.read_output)
TextView readOutputView;
- @Bind(R.id.read_hex_output)
+ @BindView(R.id.read_hex_output)
TextView readHexOutputView;
- @Bind(R.id.write_input)
+ @BindView(R.id.write_input)
TextView writeInput;
- @Bind(R.id.read)
+ @BindView(R.id.read)
Button readButton;
- @Bind(R.id.write)
+ @BindView(R.id.write)
Button writeButton;
- @Bind(R.id.notify)
+ @BindView(R.id.notify)
Button notifyButton;
private UUID characteristicUuid;
private PublishSubject disconnectTriggerSubject = PublishSubject.create();
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java b/sample/src/main/java/com/polidea/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java
index 148a01622..232e1d302 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/example5_rssi_periodic/RssiPeriodicExampleActivity.java
@@ -12,24 +12,24 @@
import com.polidea.rxandroidble.sample.SampleApplication;
import com.trello.rxlifecycle.components.support.RxAppCompatActivity;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import rx.Observable;
import rx.Subscription;
import rx.android.schedulers.AndroidSchedulers;
-import static com.trello.rxlifecycle.ActivityEvent.DESTROY;
-import static com.trello.rxlifecycle.ActivityEvent.PAUSE;
+import static com.trello.rxlifecycle.android.ActivityEvent.DESTROY;
+import static com.trello.rxlifecycle.android.ActivityEvent.PAUSE;
import static java.util.concurrent.TimeUnit.SECONDS;
public class RssiPeriodicExampleActivity extends RxAppCompatActivity {
- @Bind(R.id.connection_state)
+ @BindView(R.id.connection_state)
TextView connectionStateView;
- @Bind(R.id.rssi)
+ @BindView(R.id.rssi)
TextView rssiView;
- @Bind(R.id.connect_toggle)
+ @BindView(R.id.connect_toggle)
Button connectButton;
private RxBleDevice bleDevice;
private Subscription connectionSubscription;
diff --git a/sample/src/main/java/com/polidea/rxandroidble/sample/util/HexString.java b/sample/src/main/java/com/polidea/rxandroidble/sample/util/HexString.java
index c6378a64f..aa5d33f63 100644
--- a/sample/src/main/java/com/polidea/rxandroidble/sample/util/HexString.java
+++ b/sample/src/main/java/com/polidea/rxandroidble/sample/util/HexString.java
@@ -2,15 +2,19 @@
public class HexString {
- final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();
+ private HexString() {
+ // Utility class.
+ }
+
+ private final static char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
public static String bytesToHex(byte[] bytes) {
char[] hexChars = new char[bytes.length * 2];
for (int j = 0; j < bytes.length; j++) {
int v = bytes[j] & 0xFF;
- hexChars[j * 2] = hexArray[v >>> 4];
- hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+ hexChars[j * 2] = HEX_ARRAY[v >>> 4];
+ hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
}
return new String(hexChars);
diff --git a/settings.gradle b/settings.gradle
index 46b350675..a3f81f594 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
-include ':rxandroidble', ':mockrxandroidble'
+include ':rxandroidble', ':mockrxandroidble', ':sample'
rootProject.name = 'rxandroidble-parent'
\ No newline at end of file