mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 17:26:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to Guava 22.0-android. This raises the Java API requirement to 1.7.

Browse source
This commit is contained in:
Andreas Schildbach 2017-05-31 16:13:05 +02:00
parent 943a139d08
commit e62275d41b
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/pom.xml
View file

@ -112,7 +112,6 @@
<build> <build>
<plugins> <plugins>
<!-- Ensure compilation is done under Java 6 for backwards compatibility -->
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
@ -187,7 +186,9 @@
<urn>com.fasterxml.jackson.core:jackson-core:2.5.1:jar:null:test:e2a00ad1d7e540ec395e9296a34da484c8888d4d</urn> <urn>com.fasterxml.jackson.core:jackson-core:2.5.1:jar:null:test:e2a00ad1d7e540ec395e9296a34da484c8888d4d</urn>
<urn>com.fasterxml.jackson.core:jackson-databind:2.5.2:jar:null:test:2b4dd13fbe6f8c6b146d4c3b7fd70862f136802d</urn> <urn>com.fasterxml.jackson.core:jackson-databind:2.5.2:jar:null:test:2b4dd13fbe6f8c6b146d4c3b7fd70862f136802d</urn>
<urn>com.google.code.findbugs:jsr305:2.0.1:jar:null:compile:516c03b21d50a644d538de0f0369c620989cd8f0</urn> <urn>com.google.code.findbugs:jsr305:2.0.1:jar:null:compile:516c03b21d50a644d538de0f0369c620989cd8f0</urn>
<urn>com.google.guava:guava:18.0:jar:null:compile:cce0823396aa693798f8882e64213b1772032b09</urn> <urn>com.google.guava:guava:22.0-android:jar:null:compile:7b2fc7ef242f35bc2c9a3b816ed846c9345e3f95</urn>
<urn>com.google.errorprone:error_prone_annotations:2.0.18:jar:null:compile:5f65affce1684999e2f4024983835efc3504012e</urn>
<urn>com.google.j2objc:j2objc-annotations:1.1:jar:null:compile:ed28ded51a8b1c6b112568def5f4b455e6809019</urn>
<urn>com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8</urn> <urn>com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8</urn>
<urn>com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17</urn> <urn>com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17</urn>
<urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn> <urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn>
@ -387,7 +388,13 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>18.0</version> <version>22.0-android</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>

2
core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelClient.java
View file

@ -694,7 +694,7 @@ public class PaymentChannelClient implements IPaymentChannelClient {
increasePaymentFuture = null; increasePaymentFuture = null;
lock.unlock(); lock.unlock();
} }
}, MoreExecutors.sameThreadExecutor()); }, MoreExecutors.directExecutor());
conn.sendToServer(Protos.TwoWayChannelMessage.newBuilder() conn.sendToServer(Protos.TwoWayChannelMessage.newBuilder()
.setUpdatePayment(updatePaymentBuilder) .setUpdatePayment(updatePaymentBuilder)

2
core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelServer.java
View file

@ -554,7 +554,7 @@ public class PaymentChannelServer {
ListenableFuture<KeyParameter> keyFuture = conn.getUserKey(); ListenableFuture<KeyParameter> keyFuture = conn.getUserKey();
ListenableFuture<Transaction> result; ListenableFuture<Transaction> result;
if (keyFuture != null) { if (keyFuture != null) {
result = Futures.transform(conn.getUserKey(), new AsyncFunction<KeyParameter, Transaction>() { result = Futures.transformAsync(conn.getUserKey(), new AsyncFunction<KeyParameter, Transaction>() {
@Override @Override
public ListenableFuture<Transaction> apply(KeyParameter userKey) throws Exception { public ListenableFuture<Transaction> apply(KeyParameter userKey) throws Exception {
return state.close(userKey); return state.close(userKey);

2
examples/src/main/java/org/bitcoinj/examples/ForwardingService.java
View file

@ -138,7 +138,7 @@ public class ForwardingService {
// The wallet has changed now, it'll get auto saved shortly or when the app shuts down. // The wallet has changed now, it'll get auto saved shortly or when the app shuts down.
System.out.println("Sent coins onwards! Transaction hash is " + sendResult.tx.getHashAsString()); System.out.println("Sent coins onwards! Transaction hash is " + sendResult.tx.getHashAsString());
} }
}, MoreExecutors.sameThreadExecutor()); }, MoreExecutors.directExecutor());
} catch (KeyCrypterException | InsufficientMoneyException e) { } catch (KeyCrypterException | InsufficientMoneyException e) {
// We don't use encrypted wallets in this example - can never happen. // We don't use encrypted wallets in this example - can never happen.
throw new RuntimeException(e); throw new RuntimeException(e);