From c08cad3e0bd22169c3a8029efb22b8940e77d3fc Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sat, 15 Dec 2018 15:17:26 +0100
Subject: [PATCH] updated the Android version

---
 hyperroid/app/build.gradle                         |  8 ++++----
 hyperroid/app/src/main/AndroidManifest.xml         |  2 +-
 hyperroid/app/src/main/jni/hyper.cpp               |  4 ++--
 hyperroid/build.gradle                             | 10 +++++++++-
 hyperroid/gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/hyperroid/app/build.gradle b/hyperroid/app/build.gradle
index 87ce7f1b..ea672150 100644
--- a/hyperroid/app/build.gradle
+++ b/hyperroid/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.roguetemple.hyperroid"
@@ -31,7 +31,7 @@ android {
             ldLibs "GLESv3 -llog"
             stl "stlport_static"
             // abiFilters 'armeabi', 'x86_64'
-            abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'mips64'
+            abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
             // abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'mips', 'mips64'
         }
     }
@@ -88,7 +88,7 @@ dependencies {
     //
     // IDE setting pulls in the specific version of v4 support you have installed:
     //
-    compile 'com.android.support:support-v4:21.0.3'
+    implementation 'com.android.support:support-v4:28.0.0'
 
     //
     // generic directive pulls in any available version of v4 support:
diff --git a/hyperroid/app/src/main/AndroidManifest.xml b/hyperroid/app/src/main/AndroidManifest.xml
index 30fddf90..3cced6cc 100644
--- a/hyperroid/app/src/main/AndroidManifest.xml
+++ b/hyperroid/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.roguetemple.hyperroid"
-      android:versionCode="10420" android:versionName="10.4t"
+      android:versionCode="10504" android:versionName="10.5d"
       android:installLocation="auto">
 <!--    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />         -->
 <!--    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="9" /> -->
diff --git a/hyperroid/app/src/main/jni/hyper.cpp b/hyperroid/app/src/main/jni/hyper.cpp
index f37c4e7f..5a652f2d 100644
--- a/hyperroid/app/src/main/jni/hyper.cpp
+++ b/hyperroid/app/src/main/jni/hyper.cpp
@@ -302,8 +302,8 @@ extern "C" void Java_com_roguetemple_hyperroid_HyperRogue_draw(MOBPAR_FORMAL) {
   // text is drawn with 'textured'  
   glhr::be_textured();
   glhr::set_depthtest(false);
-  stereo::set_viewport(0);
-  stereo::set_mask(0);
+  current_display->set_viewport(0);
+  current_display->set_mask(0);
   glhr::new_projection();
   glhr::projection_multiply(glhr::translate(-1,-1,0));
   glhr::projection_multiply(glhr::ortho(vid.xres/2, vid.yres/2, 1));
diff --git a/hyperroid/build.gradle b/hyperroid/build.gradle
index 97e8b8e3..310a056e 100644
--- a/hyperroid/build.gradle
+++ b/hyperroid/build.gradle
@@ -2,14 +2,22 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
diff --git a/hyperroid/gradle/wrapper/gradle-wrapper.properties b/hyperroid/gradle/wrapper/gradle-wrapper.properties
index d3eaf649..41979d7a 100644
--- a/hyperroid/gradle/wrapper/gradle-wrapper.properties
+++ b/hyperroid/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip