Merge 18bbb2f into ef760b8

.gitignore

@@ -19,5 +19,4 @@ target/
 
 # Gradle
 .gradle/
-/build/
-/*/build/
+build/

build.gradle

@@ -63,7 +63,9 @@ subprojects {
   }
 }
 
-evaluationDependsOnChildren()
+allprojects {
+  evaluationDependsOnChildren()
+}
 
 task assembleJavadoc(type: Sync) {
   from("docs/index.html") {

settings.gradle

@@ -4,3 +4,7 @@ include ':webauthn-server-core'
 include ':webauthn-server-demo'
 include ':yubico-util'
 include ':yubico-util-scala'
+
+include ':test-dependent-projects:java-dep-webauthn-server-attestation'
+include ':test-dependent-projects:java-dep-webauthn-server-core'
+include ':test-dependent-projects:java-dep-yubico-util'

test-dependent-projects/build.gradle.kts

@@ -0,0 +1,4 @@
+plugins {
+    // This is needed because the root project needs the sourceCompatibility property to exist.
+    `java-library`
+}

test-dependent-projects/java-dep-webauthn-server-attestation/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+    implementation(project(":webauthn-server-attestation"))
+}
+

test-dependent-projects/java-dep-webauthn-server-attestation/src/main/java/com/yubico/test/compilability/ThisShouldCompile.java

@@ -0,0 +1,24 @@
+package com.yubico.test.compilability;
+
+import com.yubico.webauthn.attestation.AttestationResolver;
+import java.security.cert.X509Certificate;
+import java.util.List;
+import java.util.Optional;
+
+public class ThisShouldCompile {
+
+    public AttestationResolver getResolver() {
+        return new AttestationResolver() {
+            @Override
+            public Optional<com.yubico.webauthn.attestation.Attestation> resolve(X509Certificate attestationCertificate, List<X509Certificate> certificateChain) {
+                return Optional.empty();
+            }
+
+            @Override
+            public com.yubico.webauthn.attestation.Attestation untrustedFromCertificate(X509Certificate attestationCertificate) {
+                return null;
+            }
+        };
+    }
+
+}

test-dependent-projects/java-dep-webauthn-server-core/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+    implementation(project(":webauthn-server-core"))
+}
+

test-dependent-projects/java-dep-webauthn-server-core/src/main/java/com/yubico/test/compilability/ThisShouldCompile.java

@@ -0,0 +1,44 @@
+package com.yubico.test.compilability;
+
+import com.yubico.webauthn.CredentialRepository;
+import com.yubico.webauthn.RegisteredCredential;
+import com.yubico.webauthn.RelyingParty;
+import com.yubico.webauthn.data.ByteArray;
+import com.yubico.webauthn.data.PublicKeyCredentialDescriptor;
+import com.yubico.webauthn.data.PublicKeyCredentialType;
+import com.yubico.webauthn.data.RelyingPartyIdentity;
+import java.util.Optional;
+import java.util.Set;
+
+public class ThisShouldCompile {
+
+    public RelyingParty getRp() {
+        return RelyingParty.builder()
+                .identity(RelyingPartyIdentity.builder()
+                        .id("localhost")
+                        .name("Example RP")
+                        .build())
+                .credentialRepository(new CredentialRepository() {
+                    @Override public Set<PublicKeyCredentialDescriptor> getCredentialIdsForUsername(String username) { return null; }
+                    @Override public Optional<ByteArray> getUserHandleForUsername(String username) { return Optional.empty(); }
+                    @Override public Optional<String> getUsernameForUserHandle(ByteArray userHandle) { return Optional.empty(); }
+                    @Override public Optional<RegisteredCredential> lookup(ByteArray credentialId, ByteArray userHandle) { return Optional.empty(); }
+                    @Override public Set<RegisteredCredential> lookupAll(ByteArray credentialId) { return null; }
+                })
+            .build();
+    }
+
+    public ByteArray getByteArray() {
+        ByteArray a = new ByteArray(new byte[] {1, 2, 3, 4});
+        byte[] b = a.getBytes();
+        return a;
+    }
+
+    public PublicKeyCredentialType getPublicKeyCredentialType() {
+        PublicKeyCredentialType a = PublicKeyCredentialType.PUBLIC_KEY;
+        String b = a.toJsonString();
+        return a;
+    }
+
+
+}

test-dependent-projects/java-dep-yubico-util/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    `java-library`
+}
+
+dependencies {
+    implementation(project(":yubico-util"))
+}
+

test-dependent-projects/java-dep-yubico-util/src/main/java/com/yubico/test/compilability/ThisShouldCompile.java

@@ -0,0 +1,12 @@
+package com.yubico.test.compilability;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.yubico.internal.util.JacksonCodecs;
+
+public class ThisShouldCompile {
+
+    public String getEncodedValue() throws JsonProcessingException {
+        return JacksonCodecs.json().writeValueAsString("hej");
+    }
+
+}

webauthn-server-attestation/build.gradle

@@ -11,8 +11,11 @@ evaluationDependsOn(':webauthn-server-core')
 
 dependencies {
 
-  implementation(
+  api(
     project(':webauthn-server-core'),
+  )
+
+  implementation(
     project(':yubico-util'),
     'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
     'com.google.guava:guava:19.0',

webauthn-server-core/build.gradle

@@ -10,8 +10,11 @@ project.ext.publishMe = true
 
 dependencies {
 
-  implementation(
+  api(
     project(':yubico-util'),
+  )
+
+  implementation(
     'com.augustcellars.cose:cose-java:0.9.10',
     'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
     'com.google.guava:guava:19.0',

webauthn-server-demo/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 
     'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
     'com.google.guava:guava:19.0',
-    'com.upokecenter:cbor:2.4.1',
+    'com.upokecenter:cbor:3.6.0',
     'javax.ws.rs:javax.ws.rs-api:2.1',
     'org.eclipse.jetty:jetty-server:9.4.9.v20180320',
     'org.eclipse.jetty:jetty-servlet:9.4.9.v20180320',

yubico-util/build.gradle

@@ -9,10 +9,14 @@ project.ext.publishMe = true
 
 dependencies {
 
+  api(
+    'com.fasterxml.jackson.core:jackson-databind:2.9.9.3',
+  )
+
   implementation(
     'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9',
     'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9',
-    'com.upokecenter:cbor:2.4.1',
+    'com.upokecenter:cbor:3.6.0',
     'org.bouncycastle:bcprov-jdk15on:1.62',
     'org.slf4j:slf4j-api:1.7.25',
   )