From 125e4f185a19948c022879ce8e0b915fd028a7e1 Mon Sep 17 00:00:00 2001
From: StevenWdV <stevenwdv@gmail.com>
Date: Fri, 3 Dec 2021 12:32:24 +0100
Subject: A little cleanup

---
 Makefile                                                    | 3 +--
 go.mod                                                      | 5 +----
 go.sum                                                      | 2 --
 wrappers/csharp/Discovery.cs                                | 2 +-
 wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index a19af3e..6eb3c26 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,7 @@ test-wrappers: build
 	$(MAKE) $(foreach wrapper,$(wrappers),.test_$(wrapper))
 
 clean:
-	$(MAKE) -C exports clean
-	$(MAKE) .clean_libs $(foreach wrapper,$(wrappers),.clean_$(wrapper) )
+	$(MAKE) .clean_libs $(foreach wrapper,$(wrappers),.clean_$(wrapper))
 
 .clean_libs:
 	$(MAKE) -C exports clean
diff --git a/go.mod b/go.mod
index 10e8743..de6f86f 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,4 @@ module eduvpn-common
 
 go 1.15
 
-require (
-	github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b
-	golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c // indirect
-)
+require github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b
diff --git a/go.sum b/go.sum
index 7f4be9e..e759a4a 100644
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c h1:DHcbWVXeY+0Y8HHKR+rbLwnoh2F4tNCY7rTiHJ30RmA=
-golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/wrappers/csharp/Discovery.cs b/wrappers/csharp/Discovery.cs
index 1f3d1e8..183d94f 100644
--- a/wrappers/csharp/Discovery.cs
+++ b/wrappers/csharp/Discovery.cs
@@ -15,7 +15,7 @@ namespace EduVpnCommon
 		/// </summary>
 		/// <param name="signatureFileContent">.minisig signature file contents.</param>
 		/// <param name="signedJson">Signed .json file contents.</param>
-		/// <param name="expectedFileName">The file type to be verified, one of <c>server_list.json</c> or <c>organization_list.json</c>.</param>
+		/// <param name="expectedFileName">The file type to be verified, one of <c>"server_list.json"</c> or <c>"organization_list.json"</c>.</param>
 		/// <param name="minSignTime">Minimum time for signature. Should be set to at least the time in a previously retrieved file.</param>
 		/// <exception cref="ArgumentException">If <c>expectedFileName</c> is not one of the allowed values.</exception>
 		/// <exception cref="VerifyException">If signature verification fails.</exception>
diff --git a/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java b/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java
index d73a3d2..40d5300 100644
--- a/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java
+++ b/wrappers/java/src/main/java/nl/eduvpn/common/Discovery.java
@@ -5,7 +5,7 @@ import com.sun.jna.*;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 
-public class Discovery {
+public final class Discovery {
     private static final NativeApi discovery = Native.load("eduvpn_verify", NativeApi.class);
 
     /**
-- 
cgit v1.2.3