Release 0.15

.travis.yml

@@ -1,13 +1,15 @@
 # configuration for https://travis-ci.org/dogecoin/libdohj
 sudo: false
+dist: bionic
 language: java
-jdk: oraclejdk8
-install:
-# before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y protobuf-compiler
+matrix:
+  include:
+  - jdk: openjdk8
+    env: GRADLE_VERSION=6.7.1
+  - jdk: openjdk11
+    env: GRADLE_VERSION=6.7.1
+install: true
+before_script:
+  - gradle wrapper --gradle-version=$GRADLE_VERSION
 script:
-  - gradle -q clean install
-  - jdk_switcher use openjdk7
-  - cd core
-  - gradle -q clean build
+  - ./gradlew clean build

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
     }
 
     dependencies {

core/build.gradle

@@ -1,40 +1,42 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: 'maven'
 
 version = '0.15-SNAPSHOT'
 archivesBaseName = 'libdohj-core'
 
 dependencies {
-    compile 'org.bitcoinj:bitcoinj-core:0.15.9'
-    compile 'com.madgag.spongycastle:core:1.58.0.0'
+    api 'org.bitcoinj:bitcoinj-core:0.15.10'
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    implementation 'com.google.guava:guava:30.0-android'
     implementation 'com.lambdaworks:scrypt:1.4.0'
-    implementation 'com.google.guava:guava:24.0-android'
-    compile 'com.google.protobuf:protobuf-java:3.5.1'
-    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
+    implementation 'com.google.protobuf:protobuf-java:3.13.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'net.jcip:jcip-annotations:1.0'
     compileOnly 'org.fusesource.leveldbjni:leveldbjni-all:1.8'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.easymock:easymock:3.2'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.5.2'
-    testImplementation 'org.slf4j:slf4j-jdk14:1.7.25'
-    testImplementation 'com.h2database:h2:1.3.167'
+    testImplementation 'org.slf4j:slf4j-jdk14:1.7.30'
     testImplementation 'org.fusesource.leveldbjni:leveldbjni-all:1.8'
 }
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 test {
     exclude 'org/libdohj/net/NetworkAbstractionTests*'
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier  = 'javadoc'
     from javadoc.destinationDir
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
+    archiveClassifier  = 'sources'
     from sourceSets.main.allSource
 }
 

core/src/main/java/org/libdohj/params/LitecoinTestNet3Params.java

@@ -18,7 +18,7 @@
 package org.libdohj.params;
 
 import org.bitcoinj.core.Utils;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 
 import static com.google.common.base.Preconditions.checkState;
 import java.io.ByteArrayOutputStream;

core/src/test/java/org/bitcoinj/core/AltcoinBlockTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 jrn.
+ * Copyright 2015, 2021 Ross Nicoll.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,16 @@
  */
 package org.bitcoinj.core;
 
-import java.util.BitSet;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.libdohj.params.DogecoinMainNetParams;
 
-/**
- *
- * @author jrn
- */
+import java.util.BitSet;
+
+import static org.junit.Assert.assertEquals;
+
 public class AltcoinBlockTest {
-    private final NetworkParameters params = DogecoinMainNetParams.get();
+    private static final NetworkParameters params = DogecoinMainNetParams.get();
 
     @Before
     public void setUp() throws Exception {