Merge pull request #2 from josh-richardson/master

Minimum version of Java to 8 from 11

.travis.yml

@@ -1,9 +1,8 @@
 os:
 - linux
-- osx
 language: java
 jdk:
-- openjdk11
+- openjdk8
 sudo: false
 before_cache:
 - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -32,14 +31,17 @@ jobs:
   - stage: github release
     if: branch =~ /release/ AND os = linux
     script: "./scripts/github-release.sh"
+before_install:
+- |
+  if [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then
+      openssl aes-256-cbc -K $encrypted_0468558b4508_key -iv $encrypted_0468558b4508_iv -in web3j.asc.enc -out web3j.asc -d
+  fi
 env:
   global:
-  - secure: cA3aG2f4BcG9KSXUGoiX2BsJuPoWOYUIVB65JK3PxwoJ+QGGXRX+jBuGA7Gbbzmo76yeEvhumcYH2A58014fAFXSkVMt/Fh9KBJcu7DfCfL1Ctc6ftYwwoaMSGl+E/c9Yi7G9jS4BnIsA2PWm2u2fZ3Wj86K2babGGTmA2i1WvNZnRp+nDZ2c24t7VLy18NmkGn6rQaD7kwg3sWzYHi47+hyeV+2bQhWD7L45m0FeYJGFkgmeDhvMEPcrvD8rqwJ6092KTZOJ7KLgoVhNhmea+oJ2M+6sketqj8FS3b8lFJoOYP+b9W5EM93gSzHiIYrkwxumdVeV41wZ0DZQo4x+9GYjD8qrDraY6nqGxl6C1afAAdBd1rYjmEYFlnipRXeGq8z/dCThx9V+Z1NA6DQKN8mho5UjWSk3xhbW6cy03XV6nAOnMfxPPrEkz0bkQfbQXSpgZQD4LQzkwi8Ib4XUZCh1HDoKmgGIpnO6Nd8BO1UzPGgJR08WG3i89jKxzmOk4T39GwMh0xDZyKcwF2Nwcecj0UeJRAYCnYuBmGAFo/kspkYw1TX+2bnl049XCXr/dMiPgYBFvP8/1MnNwFj0n/c88tdAIPq/j1OfbwyBwItX6Kz2DGBhzPcntsfDy2foS2u5kr4eqM47KaasC6T8DNhY1YLxXCirDz22d3/dq8=
-  - secure: vzUJZGwMGxjGcVyiQ6/+F/KoFmZDJ+zTBLu7ljQEExropq6YBgCmEgwDX9vmJcyC/F/gPABwarc+8/ZB1qh+/Se/qbWRzrpAo4m+4N4/Kwn3lzHpZNK4dUxHpBxiH8FTiR1gyS0B/Bs7vcGnobmiY21YoEEuv1YuM/EmYK2S5GdSuMU+C/vUaEruZVIrH0iuE0aP2Z0T4DJKf6QvJYLgFfuDT2Mj9tifhmE/GJprCjntj5LrEPzn5yTPy1ynkqcj7/GEXPoCclrogWY72bJNgvgGjWbiqX9WqlttATwsaTmaSMydybDc3GuR+YBBzRXimSXhikpZRaDp5Onr/z5P41EqwB9RKJFdjykIZ1Bk6oVsn1loM8wTGMxbANVqpxZLdAc6Zk1gURl4JDsdQM5gBl6m1knjjIuEL9zp4ZxRTCoDCHBb8HvPLlBz/TjdmVSWomPR60sdvSkcCtlOc3VZF1yC6UtSG3olZwTBdVGLwGTefWUeA/c6+8L+puhLqifuq0p8ODzJELvt8obC0lhIg2BYSaG7fMskcn6DVxc/8KUaUSgkIvH6j5NXAYgu+G0cVFeZIBS0HSmwvRN/3yxACk2tOo6Cobnnd5OJwlbUVVhGs7KJNAZgHW9fYC7MjiFdEX6FhN9FYHPZeRKVhVSfz7N++gM2ZRgDn8VaUD2UmDo=
-  - secure: WLH9E5bfsstTpgcNEDNjvhWndPUO4JnmzwhqNdaffRYBLyJC39lHcnGQ6DuvPK9NVDZPanGP/iqaghKikXhUecGDMkIM9kMFpG3/CYXQohvfx36l9SiJRIcgy9Bx5X5e31IOQtvelDIoFRYQISxm6dQyvNJHvY/7KLy0ndVLebEbjTJvEoGbZebYSxNhr1CmrqwnFqU+dzJgBEiFxbUbLP3Ggu3g4GSzlLvvtKfNZW5Bjkiewpsb9NI0JvjfWFgLjzZplB+17q0E6kzBRJo+jFRvx2FXmNdHEPrPq/5gHfi6R5koBP1NQWluK1AIEHtU08bWwvKXv2SsOhblHi3LyVG0mUUvLNwzFzGMFq22nZBQ76fueJdIojyj/8E9MIZ5LyDrkoO/TZYWxPeXKwwC3yhdN44c6lB7+Lpz7z1kfFH6aRnq+Nlq61DfeiE/Anvo65hVMzQW7oXNApeIrYXEAO1JZORHs8frfSUwEA2e+gXC41RdPWgL05drAn8nxAexkgouMFx5q7xWlcn8Xd690PZTfpvadPb3UIc2gwWTa7wiY7KIKlHpLKkOxhhTY9U3kFqG+RotOzI7sAQwZjK26aZrC9rhe3Q73ocv5xgZ8poRsgImOjZYrQMfslJnB7osMQIihkorZ1oHczvDyKC1KqYKhsZOZ/MzlrI7zmYmgvc=
-  - secure: qUZLneDteq48nPkax3zKxF7lqWcXE1AByTS0Oi0NZ8z1Vnro2qhuDK7Bn5JC5ml9sQVsISYKrkbtiaXrxeImPEvfR44iATnSbnsYnLJZ11ICIA0oZJBXkOPA0J4Cxenri17Xd8iv5Vy7zFB0R5Bw5FtJEfI4TupN+nkMVuOjcFn5dijfjhAPPBpjKkWaIB/SIGZJbF3HRve/tlzH+bD+fSvDTASmciCJluDl5oE6HjfAtbgfihrhAWeBi92OpmW6/g5QhX4Henzrboe8W5p/6dw6tEY6awE/FPSCuFVIr2rF6d1P3L7VXlQa69+HsXRexku0e3EzShwaS99kA4uuybVn6MN5IunQeCF60IO51/Mh5sAxT/ZiFrBXtlZijX4ZhmnIqRM/HoxsNJkR5Ep5iCOtnNwDBQ/n8kSuNccS80LktnDW/QRvbN2en2Z7vLPT2JY9t0L9kM/wShFwvvVb572Iz/WcrccmxYiafKnPnzjCpgId56sMVVGUmMA2mZBrW4lIlJX5o9Slf5zEovP+XH0UvH6RWdjttyZb/0hFyjEIiXWlRF3hAQeGgRRFMNZ/vVRY2A38Hv9fTS+mUM9BGkF/iBD6K5p22j3SGbVeDEoVIDqfl52Je+0SbWoLGfXbstPFV+6+KMBaOon86yZU9/051X6vJmdHtmmlrMzU4g4=
-  - secure: bYIikZNT14uB7H1N522oXfnCdAE5wY01n4/QlN4ixTbn94J6X27RFAHy1ItdMOf+RRc9xA6Y404Spd+ciK3NIcwzTryzcD+fG42RLFhid+jF4JZiv7poGR/Vj8KurzUqt6nxY/S544lN6rIM/ke9xqGsWLmlIr85AEhuLtoKxdOnN5aw2oRblPraVQK0ff8QCSbHDnh1JEq9P/pd+NXGlppaLNifnBDq6naD9leWXrJSu/CgoBxtxQJ3RfwWacpZ82zG74pfVDryeY4xwJ3d9sRqVHgoPUQbbVx2v4Bu5vV1dAeCuUZynUyaNvjLUXqNUZ9shXXK7t/G9cV2VmOlmsuAHlI+84016KXIXTGOJ5V98mho8NSBTzrjjuFbf+XpdYVD+OExIpud0V5uArOl7Ds6rIMw+LjuxVqxrev7OVyZ+WnCdfFGp8uwqGwlkam3rHTOPEn63BjqUsMA4xv1CE3vQDgVjCv20bk8vK0/J54o+vQaHwpuEvzqZT2PmsO4nRtCKSu4uQxAEVSimazgGcJBW9ucAfRPuIv/gU9vHWxH3Rr/WahYZcKDdzGUuTPSRgVr62Lic1gE42PZAPTSxJym78s7/JLYWppk9uKp8QcPIOwihkY0WbFE9IyEewoPNzWU8lhc4W2BDeQarldwfPCTWkjETLyNWByGX1B6pPE=
-  - secure: FEtygx1AQq3kG/gENTs11PLIc+jXTbcOoNCIiLdYtdUVqB98qAy6jZrz6vXXUShvb0pbJBxWKy81akE+I27oYZR2sAx2OMQEEF970ke6NEbfsSpsInJsu/1CrtEVTxbSQ57P2OjTuUsZdtpBbD3e/38WiDw4D72bzCDQLoSMqfXy2fZ1hPs2KePDTDOBy5JHdZoQNpuzj5+9PTUnXto4hGKNi82AW1b6ioGqlylR0UaImfA02+PjMkwLLYy9xmSpP41vPAfXRWMTvux5XA1yGGTWi6x4wEt8hktcasnYhArz6UqcovTrGdOt+8KJ0nws4oLf+FP3Y7/1Ak7JB8jmK2pYSoQINE9Uyy4IMZpq5B22KC3u5B9KfZ7UE6P5Z2dfbYxcYXOO7UEFNJhmU1bFxfjlJV9tImylk2Zad/A4GT6LSp1eHshAg+74iIx1UxzdRhnFDYjWnPHRzYeTnHFPLk1iZjaaEuajs5kIVdjdKosPASvzK1jcLYYl8Iwyfv2dAVlWHbP6Y8SKJyXMbwMOu1clGiIRlHOI+pKqCWG4U5UMg4/rmBLydINVo3UBcsbwZx0BD58mOrynblQ+Ij0kotpQmCk/M/rpMoBRuHnPCnIdqmWk1dpJrkj1JHDHPFL0Cz6OhfzKCvb1uAqoJJd8HsUtEfLR4xF0ky3vKVnDVdc=
-before_install:
-- openssl aes-256-cbc -K $encrypted_79f8c2494b60_key -iv $encrypted_79f8c2494b60_iv
-  -in web3j.asc.enc -out web3j.asc -d
+  - secure: mel2ZBpGZrgQzXUg7j7t2jYfEARO+Da+bejgEdGTK0bo+yKUvO9jr7OGNsGopg3A/JgVh+h8OKoN22r/cpFJ91rdqHs3T9ReBZIPcXlQVhyUA+gOgGRDq9drOWegrweWahWuPxTmSsNE4/8UrNItf+p8e9DE+89ElUKk3Q84qSEI4SJZdb9qvB4vUGbKtjkIjoGb1v1l4953Q1MZBXb5ExqWgIS+xhCjmvtvEP2F9iqTHZJAY03c5avt6al6a6/tzbn0wHx7fVFLimfTBwVyS08E3dDtUn2U04q2vNPBJ7G8gca9qM7a0cKT/1xOkqdNOJmSZmLMXYIYPjaqsavLKExTKGB0wX2/9HkvDjkXE/47jBe6Ihqq9SXU4t3MxA2gUPrFyMuonJcIvUteY9i69IEvRoWX6X4ik6QkxfYbcaMqVxJNA15pexC69Q/CrJGWkbD+fiZO4APaB30hcG2dLJ/0+ZGQ43WPx9lJWVyTTceHVlDprMj4q9lzma1/Kas1VJPgb+SI+m7Xc8jx/LwJ0ahlogSJumjUhPXAghc4i4J8TkDDguHLxQ28V5yVKCaK/qkqCdsbuw6LaXslptJ7Zu1YACnlGPeZuVYgAsF5JhgzGdUbfZUu3gGOJf76frbQFTn0k9GiVY122wgLt4tDNM17xZSODX4TOh8E7S9rAmw=
+  - secure: Q2WDwbdd8db/28FUuTVn5gaOhrsuljUUqIv7TFfJP2u80GNffXYJ6jphcaWjBfx2IWxdGbdbOcYjDZIANWXP8CC0bHd+2qv5LcK573/dKoxiZnQECP5lANNDW7jJ8WVFjEz2pFGRyxbhWvl+i8szpOkaCUwXYZxB5jl048hzNANVMU7GrrHx5NemOzKVNS/lFX6LonAkloHFKkeFWn3y0EUidtpLmKd7ZIWj/0f4CDzHQaZLebX+3Ng1FJsdmEIryjCiJQaXXCnq0aa9Q9ZG5SPiBnci2L3w28LRA/vJPVppodyxRUZMtb7fwdY90vf5V/jGgg3P8o3HOtjYWjNvycCP+JTQmJwlDMUH+KFNFaMIisYboib23MjMDID399qC5f9/uLI3E12zyNsyzyeu8b4TOsRnSPSwcVx/YfceLMSED0BAH56trNttJhY8sr5hFlkk+zY6XFfoelpbRAsdLemHtWw0MxR6MVJUwSQKBGhpDnvn6GLe2EQ4i1q2F8YfXRv21T6O6a4hembklJAaRqEEUAtnB9ALVPnOJL3yiRGaM3GzjESfRwWZ7UEs2oTLO6ubcmN9C4zS8M7QJFLbs1+dzHdJm6+KlyfPImyF7lv7fgLljpwyfnfLBSPpkaVC4z/kChjuVq2W47TzL7C5TNCByp1SgBn+TIfPitB8GlM=
+  - secure: EdB2Yp4yhXRUksqgxlFLTPlzonlrgQ1P9m5XwDMzThErt/EAhzVCMfMtJkUG9Xm0MSo3JpAtzAyhlj1a3H+kKn8mW5V1udZvexcNyPY8oojBYStXDp/uOApZ9m3qX3y419t5L0eyUWLb7BpCMn3q6eyTsePnxAve3YEy5HwsgSUw8lxnHqX6VjbOWu8rg6W6jAFfZyZuscdJIpnnjhQZ3XCdV93xZbSCuVtf/oLKMT80RyYddeoMq+L8J1QQqspgVFT67Ijl+bd1xzZic1/9m6Ypn8WEy9fcA8oN+SscUM2JZxPpTZZ1QhsxbFg5OeM5IQsuOwqXX3a2pwhuY7/iQAneeh0mfBIuICDlcItVwupFlexksUVOwFULNvppdQp9zAdK7sS0u/FI62AVIUf4aj1FgzwKrXHFB0ifOB7f/L6R0THbUpTKK1Ytb6Tepf6e5uTKXayj8rVlDRtUzRg6CDUy7c3hKX7GzZaKALJ5rAbiCJd1aOHYqfTNowJ/6LYSpcrMFB2+4Pt+pBjyh2M5ni9qGqf8zzE/Z7/JiQUtbZyCMmcd6TR5vvZoInDlx3rs1Jl8eUN6eSKF/4zqxFlEIwXFt49Lco0QDoxlDWIL0zRyDdn9yavdmdzdG/svsRPAqNAYorNVW1aoAsSMHMFRQTIU/Z989y1f7lBgegIWPNQ=
+  - secure: lLxgOKmDBRrUIRilVcKTaK4xFFfe9Hdhh663s6KHkzAITcSLCrEJHlv+bzlXTAHgaycYGWQU4Z64D2QB7GcJBAC90rCidWs7n6XYHzuwf3OP8YYJqFnad8cGaboEQmqwudcQBhWcHf6pmBw7YmGQ6CJGT2CVsENfiCQxsSyaoEUVPv4No0DvInIdTDwUFXOi+CjMo/vIYKxQcI9dEBSB7NnEhr2jp2Qa7019HT7WZ+k2RKdpTg9nvdwRo9LvxLQB8lMVFiP+SI6M7oQuAb1L6TdJimlgEMDcCxfch0XXT8bDgazPlov34GClGBIz5jGyfvc6q9mtLccmXcr9oR4+sp3BmSfHCXoy3kpxyd1zXPE8a8k1JWEwWAwL7bs4S8aym5lCoXJilFJ7cIlDTiZc4LIFMe1SSndWPAnYY0bkgE6A39I8EqVGhhB5GypK3QS/OK0Pmn/yqpeyaTMPm7k3c29MLgyj3Yc4n7dmwssTh5C3RssjYNEJ0z7h3+QSxj/MMzhG10WNGiQ+FE9vnF1MtW0qpnhC5SRj7C8Hs0sLXISGMQsM3fsktV8RbCt2S7xn9o5GU0kWXJoCyi/f/fy9Gq6FhbtWby6VkE4nL1KPgJwhI7WuLT8rKooMrTSEmLjvQhUAQzK3JM3OEWV3++u/7eNjMVBUbttikaXLxK0dbTY=
+  - secure: d1hJYib4xrmAONvW9akaa7u7xG3U+jmXnZxjwHkBXonDGxNNpL5Hd8zbyGO8HN0ZUd9fer3CyY/RNq6mFimXtHsNbboOUXL1JWxNwiAlwOne3g9lFDw/+2k2px4ZWpX8sL9cIo/VhzITwvHxbYTPN9CdX+uGMQYm1zEBy2SUrm/MOqdodbKKWa/ucVVSvnTza0KB2FbOEViBOsd8bbKcFhnMWb7wrGHq6v+anjRLgndMK4I8O/V4yRIKW7RJ/zF3FW+fpJA56XU+aKnbmvrG8906jAq3iECmpOe4ZxG5p5AMQPbs1zfok9k9Ciw1MGIs+wcA0EYw8H1rk+Zb3rPlIlJasJjJdpSMMCJijDlwFpcGD4TsBHWEcvJcFqab+rdbJ6wArk4JNanbVV71+Pda4WH7ffH5/+hiHYXGTzS3Sm5uSg91M8Wz2TAR37hBPl3NcHJ0/F3wFxJGzRObVbxnNpxqeTK3EtCDiPRTV3JUx/P/a5C1gVKAQyQLN492zLDGVHPsu+otOWffMTGBFnjucf/7k5IikFAZckvB5xMXozakl8Npahnqd3h/7O0mGRVEczQKbPBH19UHLy1Bpj0Dp7Ekwf096vqmB9KczxvlrCIfxM8jthFYuQKJH2q/BETVgOlkgxtL8OneHv5Qg0KEKJ3nZBwM9pF8zrCwb1Q0bZI=
+  - secure: f2uCPxOIkJqBIaX5MnsdHlwfaUxF6v4V/wtyWvhre3j+X9A+COiOwio3Cgfe6OTLTUsujw07uaNoxmrmal5y5ohf5OWw6jIRE/x19I2V8lavBTJ2FXbfa3eVPUt1djxttvc5BwylnvEpZCPy09ES5Q/DuhMOmrTfHcWbVxLRu1urHNekltsmVrGY9zg/jhQdJ3HAcYHB186dHud0ckDEYQri4rA80lXRk4EoDWHpqs4OY6pATjZcUVmULPB1Kn13J9X2/UhG7SfCgU08o/knXRpNyJNWGDjRgLyggOMZWSpjuoxuPw/RosAS5PiZaxBJKOqV6p1SCQbe5cmcHcYcWCZLGYXlcipoYKxBSJgrui4CLozuSYBDm3+1e9GGREFGvnqApPzHnoLMA+z1LE1ZYBlRmCjS98u+8rN7B1HNIyp1b6tR8I7jOJsx4uFvDtzqDIsIKG/c1MgdOasV44k0tkdzFvkVuhlZ/eG50h8MFl32geNHF/C4apGCnKSCDMPd4Gi3zGhRlyjvBXjItuhJ5umIyyqqtNRAIdloTVNJ8VKkPyPrQBQE50Q0p36BynW0G+1jNL/9txtiV+wU2k7U2znOYuOUZxkgXEbO+sxedI0fzw3QRIfgCFgT8n357TPakVlTk4hlCowFBrIv8XD5EGjUdEpZ6l56UoQsO7fUTxo=
+  - secure: PXCIKH3x6Mpa/iGtHtMlK84uWx2rNpu+xp9CkVGCpgzA6JssaX0j6XsQA47wNcTsDw0AWrwic4U4U3vBMAg2gQCZE3kbShIjOzNhfvWDJoWD/B/a9cD1JttthfFtGBjNdnhF/bJ4RlBGgl8kLOW7HAqJwgsSNd11l6b0pVI8D65stSXk8cj5PusB55n34fUSosoxY7Ae/XqcjaFymWeQjjh3RwQm/9foqcG9HZMwIJ3hfSUO3x4MoZlWHSD62jUBag2LMAzN0osbASd+iW5RS+5vioQz0InHPoTcHJ3IIIrjyXUzB4swAcEOobWBYUtmS61IbDA3Oeynj8d7Ye2dFb17FT8PmLl9a4Y5CGK9OfxP0glGpHgl6yByIS03XMH9SBwBFcp5WP9jD+JTxQUnAKefVKx0oc8RIGSmB4WXX0hzanLd7prYvITNx1ZTcVPY0ZhJn4lGVlycxXGrL7NvxJtkayzfCKo3ApA4+izHMACzeO+VXrbpGXT6oLOJvevb3NLaPtVKx7726UzBNChV8oIan2H/85WFoakijQ2x5n+O52XEiTw8sGEC7TvT0GhUSU9V3TpzCWwBJy71pwmyMNW6kbUgm28DLbNqE3sNn5kuPMDZmeNjHnQZNBx+eEHIOxENU99duyAb3Hh3AO2449BufmNHsXdTi2dbR+bvJW4=

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-#Sat Dec 07 21:56:24 GMT 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+#Thu Mar 05 14:16:43 GMT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

src/main/kotlin/org/web3j/sokt/Main.kt

@@ -28,7 +28,8 @@ fun main(vararg params: String) {
             SolcArguments.OUTPUT_DIR.param { "/tmp" },
             SolcArguments.AST,
             SolcArguments.BIN,
-            SolcArguments.OVERWRITE
+            SolcArguments.OVERWRITE,
+            SolcArguments.METADATA
         )
 
         println("Solc exited with code: ${result.exitCode}")

src/main/kotlin/org/web3j/sokt/VersionResolver.kt

@@ -19,12 +19,11 @@ import com.github.zafarkhaja.semver.Version
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
-import java.lang.Exception
-import java.net.URI
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse.BodyHandlers
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.net.URL
 import java.nio.file.Paths
+import javax.net.ssl.HttpsURLConnection
 
 class VersionResolver(private val directoryPath: String = ".web3j") {
 
@@ -40,13 +39,21 @@ class VersionResolver(private val directoryPath: String = ".web3j") {
     private val tokenizer = DefaultTokenizer(listOf(ver, hat, til, eq, lt, gt, ng, ignored))
 
     operator fun get(uri: String): String {
-        val client = HttpClient.newHttpClient()
-        val request = HttpRequest.newBuilder()
-            .uri(URI.create(uri))
-            .header("Content-Type", "application/json")
-            .build()
-        val response = client.send(request, BodyHandlers.ofString())
-        return response.body()
+        val con = URL(uri).openConnection() as HttpsURLConnection
+        con.requestMethod = "GET"
+        con.setRequestProperty("Content-Type", "application/json")
+        con.setRequestProperty("Accept", "application/json")
+        con.doOutput = true
+        val reader = BufferedReader(
+            InputStreamReader(con.inputStream)
+        )
+        var inputLine: String?
+        val response = StringBuffer()
+        while (reader.readLine().also { inputLine = it } != null) {
+            response.append(inputLine)
+        }
+        reader.close()
+        return response.toString()
     }
 
     fun getSolcReleases(): List<SolcRelease> {