summaryrefslogtreecommitdiff
path: root/wrappers
diff options
context:
space:
mode:
authorStevenWdV <stevenwdv@gmail.com>2022-02-09 14:12:58 +0100
committerStevenWdV <stevenwdv@gmail.com>2022-02-09 14:12:58 +0100
commit19b583d03d3a9e654e149db971f1c752ad807f46 (patch)
treeed71dedc695397aacefad93df3de996e7e78dc2c /wrappers
parentac564204f6d4441eaa79ec08ec7a91e99bdb9a15 (diff)
Cleanup
Diffstat (limited to 'wrappers')
-rw-r--r--wrappers/java-android/README.md6
-rw-r--r--wrappers/java-android/lib/CMakeLists.txt2
-rw-r--r--wrappers/php/src/Discovery.php2
-rw-r--r--wrappers/php/tests/DiscoveryTest.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/wrappers/java-android/README.md b/wrappers/java-android/README.md
index 763c8d6..db55673 100644
--- a/wrappers/java-android/README.md
+++ b/wrappers/java-android/README.md
@@ -12,7 +12,7 @@ versions.
If you see `Unsupported class file major version xx` then Gradle wants you to use an older Java version. If you
see `Android Gradle plugin requires Java xx to run.` then the Android Gradle plugin wants you to use a newer Java
-version.
+version. Set `JAVA_HOME` to the right JDK install.
See the [list of Gradle releases](https://github.com/gradle/gradle/releases)
and [list of Android Gradle plugin releases](https://maven.google.com/web/?q=com.android.tools.build#com.android.tools.build:gradle)
@@ -83,3 +83,7 @@ copied from the `../../test_data` folder by Gradle.
This library uses JNA, not JNI. Hence, there is no C wrapper. The library is dynamically opened with `dlopen`
via `libjnidispatch.so` which comes with the JNA AAR.
+
+If you want to know how the tests would look like with JUnit 5, or if for some reason you want to look at a pure Java
+wrapper using Maven,
+see [`b60ecf2`](https://github.com/stevenwdv/eduvpn-common/tree/b60ecf2fe5ddfe506e02093286b3931873187e91/wrappers/java).
diff --git a/wrappers/java-android/lib/CMakeLists.txt b/wrappers/java-android/lib/CMakeLists.txt
index 9bea062..8e8ff87 100644
--- a/wrappers/java-android/lib/CMakeLists.txt
+++ b/wrappers/java-android/lib/CMakeLists.txt
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.18.1)
project(eduvpn_common)
-set(CMAKE_VERBOSE_MAKEFILE on)
-
# Android -> Go architecture map
set(arch_map_x86 386)
set(arch_map_x86_64 amd64)
diff --git a/wrappers/php/src/Discovery.php b/wrappers/php/src/Discovery.php
index 99464f9..39aa53d 100644
--- a/wrappers/php/src/Discovery.php
+++ b/wrappers/php/src/Discovery.php
@@ -11,7 +11,7 @@ final class Discovery
{
public function __construct() { }
- const LIB_NAME = "eduvpn_common";
+ const LIB_NAME = 'eduvpn_common';
private static ?FFI $ffi = null;
diff --git a/wrappers/php/tests/DiscoveryTest.php b/wrappers/php/tests/DiscoveryTest.php
index fdce505..4e4fbeb 100644
--- a/wrappers/php/tests/DiscoveryTest.php
+++ b/wrappers/php/tests/DiscoveryTest.php
@@ -8,7 +8,6 @@ use PHPUnit\Framework\TestCase;
class DiscoveryTest extends TestCase
{
- /** @var string */
private const TEST_DATA_DIR = '../../test_data';
public static function setUpBeforeClass(): void
@@ -41,7 +40,6 @@ class DiscoveryTest extends TestCase
'server_list.json', 0);
}
- #[deprecated]
public function testOldSignature(): void
{
$this->expectException(SignatureTooOldException::class);