Update Android example to use the latest library versions (Formidable…

…Labs#316)
andreasantaca · Jun 4, 2019 · 7627363 · 7627363
1 parent 06220a3
commit 7627363
Show file tree

Hide file tree

Showing 12 changed files with 1,226 additions and 1,091 deletions.
diff --git a/Example/AndroidExample/.flowconfig b/Example/AndroidExample/.flowconfig
@@ -24,7 +24,6 @@
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow/
-node_modules/react-native/flow-github/
 
 [options]
 emoji=true
@@ -67,4 +66,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.86.0
+^0.92.0
diff --git a/Example/AndroidExample/App.js b/Example/AndroidExample/App.js
@@ -10,14 +10,16 @@ type State = {
   hasLoggedInOnce: boolean,
   accessToken: ?string,
   accessTokenExpirationDate: ?string,
-  refreshToken: ?string
+  refreshToken: ?string,
 };
 
 const config = {
   issuer: 'https://demo.identityserver.io',
   clientId: 'native.code',
   redirectUrl: 'io.identityserver.demo:/oauthredirect',
-  additionalParameters: {},
+  additionalParameters: {
+    prompt: 'login'
+  },
   scopes: ['openid', 'profile', 'email', 'offline_access']
 
   // serviceConfiguration: {
@@ -32,7 +34,7 @@ export default class App extends Component<{}, State> {
     hasLoggedInOnce: false,
     accessToken: '',
     accessTokenExpirationDate: '',
-    refreshToken: ''
+    refreshToken: '',
   };
 
   animateState(nextState: $Shape<State>, delay: number = 0) {
@@ -54,7 +56,7 @@ export default class App extends Component<{}, State> {
           accessToken: authState.accessToken,
           accessTokenExpirationDate: authState.accessTokenExpirationDate,
           refreshToken: authState.refreshToken,
-          scopes: authState.scopes
+          scopes: authState.scopes,
         },
         500
       );
@@ -66,14 +68,14 @@ export default class App extends Component<{}, State> {
   refresh = async () => {
     try {
       const authState = await refresh(config, {
-        refreshToken: this.state.refreshToken
+        refreshToken: this.state.refreshToken,
       });
 
       this.animateState({
         accessToken: authState.accessToken || this.state.accessToken,
         accessTokenExpirationDate:
           authState.accessTokenExpirationDate || this.state.accessTokenExpirationDate,
-        refreshToken: authState.refreshToken || this.state.refreshToken
+        refreshToken: authState.refreshToken || this.state.refreshToken,
       });
     } catch (error) {
       Alert.alert('Failed to refresh token', error.message);
@@ -84,12 +86,12 @@ export default class App extends Component<{}, State> {
     try {
       await revoke(config, {
         tokenToRevoke: this.state.accessToken,
-        sendClientId: true
+        sendClientId: true,
       });
       this.animateState({
         accessToken: '',
         accessTokenExpirationDate: '',
-        refreshToken: ''
+        refreshToken: '',
       });
     } catch (error) {
       Alert.alert('Failed to revoke token', error.message);
@@ -112,8 +114,8 @@ export default class App extends Component<{}, State> {
             <Form.Value>{state.scopes.join(', ')}</Form.Value>
           </Form>
         ) : (
-            <Heading>{state.hasLoggedInOnce ? 'Goodbye.' : 'Hello, stranger.'}</Heading>
-          )}
+          <Heading>{state.hasLoggedInOnce ? 'Goodbye.' : 'Hello, stranger.'}</Heading>
+        )}
 
         <ButtonContainer>
           {!state.accessToken ? (

diff --git a/Example/AndroidExample/android/app/build.gradle b/Example/AndroidExample/android/app/build.gradle
@@ -95,7 +95,11 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "com.rnappauthandroidexample"
@@ -112,7 +116,7 @@ android {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a"
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     buildTypes {
@@ -126,7 +130,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =

diff --git a/Example/AndroidExample/android/app/src/debug/AndroidManifest.xml b/Example/AndroidExample/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+</manifest>
diff --git a/Example/AndroidExample/android/app/src/main/AndroidManifest.xml b/Example/AndroidExample/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
   package="com.rnappauthandroidexample">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
       android:name=".MainApplication"

diff --git a/Example/AndroidExample/android/build.gradle b/Example/AndroidExample/android/build.gradle
@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.2"
+        buildToolsVersion = "28.0.3"
         minSdkVersion = 16
         compileSdkVersion = 28
-        targetSdkVersion = 27
+        targetSdkVersion = 28
         supportLibVersion = "28.0.0"
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,9 +31,3 @@ allprojects {
         }
     }
 }
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.7'
-    distributionUrl = distributionUrl.replace("bin", "all")
-}
diff --git a/Example/AndroidExample/android/gradle/wrapper/gradle-wrapper.properties b/Example/AndroidExample/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/Example/AndroidExample/babel.config.js b/Example/AndroidExample/babel.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ["module:metro-react-native-babel-preset"]
-}
+  presets: ['module:metro-react-native-babel-preset'],
+};
diff --git a/Example/AndroidExample/index.js b/Example/AndroidExample/index.js
@@ -1,6 +1,5 @@
 /**
  * @format
- * @lint-ignore-every XPLATJSCOPYRIGHT1
  */
 
 import {AppRegistry} from 'react-native';

diff --git a/Example/AndroidExample/metro.config.js b/Example/AndroidExample/metro.config.js
@@ -0,0 +1,17 @@
+/**
+ * Metro configuration for React Native
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ */
+
+module.exports = {
+  transformer: {
+    getTransformOptions: async () => ({
+      transform: {
+        experimentalImportSupport: false,
+        inlineRequires: false,
+      },
+    }),
+  },
+};
diff --git a/Example/AndroidExample/package.json b/Example/AndroidExample/package.json
@@ -7,17 +7,18 @@
     "test": "jest"
   },
   "dependencies": {
-    "react": "16.6.3",
-    "react-native": "0.58.6",
-    "react-native-app-auth": "4.1.1",
-    "styled-components": "^4.1.3"
+    "react": "16.8.3",
+    "react-native": "0.59.8",
+    "react-native-app-auth": "^4.4.0",
+    "styled-components": "^4.2.1"
   },
   "devDependencies": {
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "24.3.0",
-    "jest": "24.3.0",
-    "metro-react-native-babel-preset": "0.53.0",
-    "react-test-renderer": "16.6.3"
+    "@babel/core": "^7.4.5",
+    "@babel/runtime": "^7.4.5",
+    "babel-jest": "^24.8.0",
+    "jest": "^24.8.0",
+    "metro-react-native-babel-preset": "^0.54.1",
+    "react-test-renderer": "16.8.3"
   },
   "jest": {
     "preset": "react-native"