fix: fix issues so example runs on latest stable

zino-hofmann · Dec 12, 2019 · 87d8feb · 87d8feb
1 parent f7b99ba
commit 87d8feb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/packages/graphql_flutter/example/.flutter-plugins-dependencies b/packages/graphql_flutter/example/.flutter-plugins-dependencies
@@ -0,0 +1 @@
+{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"connectivity","dependencies":[]},{"name":"path_provider","dependencies":[]}]}
diff --git a/packages/graphql_flutter/example/android/app/build.gradle b/packages/graphql_flutter/example/android/app/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -38,6 +38,11 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    // Temporary fix until alpha10
+    packagingOptions {
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
 }
 
 flutter {

diff --git a/packages/graphql_flutter/example/android/gradle.properties b/packages/graphql_flutter/example/android/gradle.properties
@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.enableJetifier=true
diff --git a/packages/graphql_flutter/example/ios/Flutter/flutter_export_environment.sh b/packages/graphql_flutter/example/ios/Flutter/flutter_export_environment.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/mjr/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/mjr/Documents/code/libraries/graphql-flutter/packages/graphql_flutter/example"
-export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_ROOT=C:\tools\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\Users\mw\projects\opensource\graphql-flutter\packages\graphql_flutter\example"
+export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build/ios"
-export "FLUTTER_FRAMEWORK_DIR=/Users/mjr/flutter/bin/cache/artifacts/engine/ios"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=C:\tools\flutter\bin\cache\artifacts\engine\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
diff --git a/packages/graphql_flutter/example/pubspec.yaml b/packages/graphql_flutter/example/pubspec.yaml
@@ -1,6 +1,9 @@
 name: app
 description: A new Flutter project.
 
+module:
+  androidX: true // Add this line.
+
 dependencies:
   flutter:
     sdk: flutter