From a63a742e3930159929efd679c49cdbe6f94f1d3d Mon Sep 17 00:00:00 2001
From: "Hans P. Reiser" <hansr@ru.is>
Date: Thu, 19 May 2022 00:17:54 +0000
Subject: [PATCH] some build system verison updates

---
 README.md         | 13 ++++++++++---
 package.json      | 22 ++++++++++------------
 www/css/index.css |  2 ++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index f447718..0bf8d0e 100644
--- a/README.md
+++ b/README.md
@@ -6,22 +6,29 @@ See https://github.com/dl9rdz/rdzwx-go/wiki for details how to use.
 
 ## How to compile and run
 
-- Install Android Studio
+- Install Java (I used openjdk 11, gradle and android on API level 30 do not support later openjdk version) and gradle (I used version 7.4.2) (I installed both on MacOS with brew)
+
+- Install Android Studio (currently tested with Chipmunk 2021.2.1)
 
      In Preferences: Appearance&Behaviour > System Settings > Android SDK
      
-     SDK Platforms:  select some relevant platform (I used API level 29)
+     SDK Platforms:  select some relevant platform (I used API level 32)
       
-     SDK Tools: I selected Build-Tools, NDK, SDK command line, emulator, SDKK platform tools (maybe not all necessary)
+     SDK Tools: I selected Build-Tools, NDK, SDK command line, emulator, SKK platform tools (maybe not all necessary)
+     Specifically, build tools 30.0.3 are needed!!!
       
 - `export ANDROID_SDK_ROOT=/Users/me/Library/Android/sdk`
 
   Use path shown in Android Studio preferences as "Android SDK Location"!
   
 - Install node.js (after that you should be able to run "node" and "npm" on your command line)
+  (On MacOS I did 'brew install nodejs')
 - Install Cordova (used version 9.0.0): `sudo npm install -g cordova`
 - clone the git repository (`git clone https://github.com/dl9rdz/rdzwx-go.git`)
 - `cd rdzwx-go; cordova platform add android`
+- cordova plugin add cordova-plugin-androidx-adapter
+- npm i jetifier
+- npx jetifier
 - `cordova build` to build debug apk
 - `cordova build --release` to build releaes apk
 - `cordova run android` to upload apk via usb to phone
diff --git a/package.json b/package.json
index 32bfe68..54699f4 100644
--- a/package.json
+++ b/package.json
@@ -13,22 +13,19 @@
   "author": "Hansi Reiser <dl9rdz@darc.de>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "cordova-android": "^9.1.0",
+    "cordova-android": "^10.1.2",
     "cordova-browser": "^6.0.0",
-    "cordova-electron": "^2.0.0",
-    "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-device": "^2.0.3",
-    "cordova-plugin-inappbrowser": "^4.1.0",
-    "cordova-plugin-local-notification": "^0.9.0-beta.2",
-    "cordova-plugin-whitelist": "^1.3.4",
-    "de-dl9rdz-rdzwx": "https://github.com/dl9rdz/rdzwx-plugin.git"
+    "cordova-electron": "^3.0.0",
+    "cordova-plugin-androidx-adapter": "^1.1.3",
+    "cordova-plugin-inappbrowser": "^5.0.0",
+    "de-dl9rdz-rdzwx": "https://github.com/dl9rdz/rdzwx-plugin.git",
+    "rdzwx-plugin": "github:dl9rdz/rdzwx-plugin"
   },
   "cordova": {
     "plugins": {
-      "cordova-plugin-whitelist": {},
-      "cordova-plugin-inappbrowser": {},
-      "cordova-plugin-local-notification": {},
-      "de-dl9rdz-rdzwx": {}
+      "de-dl9rdz-rdzwx": {},
+      "cordova-plugin-androidx-adapter": {},
+      "cordova-plugin-inappbrowser": {}
     },
     "platforms": [
       "android",
@@ -37,6 +34,7 @@
     ]
   },
   "dependencies": {
+    "jetifier": "^2.0.0",
     "net": "^1.0.2",
     "xmlhttprequest": "^1.8.0"
   }
diff --git a/www/css/index.css b/www/css/index.css
index 2b77266..cb5f5c7 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -127,6 +127,8 @@ html, body {
   font-size: 11pt;
 }
 .tawhiricontent input {
+  color: #ffffff;
+  background-color: #000000;
   font-size: 11pt;
   width: 5em;
 }