update to android SDK 27

This commit is contained in:
Bart Akeley 2018-11-03 12:09:35 -05:00
parent 04f0384682
commit 2bd767549f
8 changed files with 2316 additions and 1427 deletions

View file

@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = true
def enableProguardInReleaseBuilds = false
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 27
buildToolsVersion '27.0.0'
defaultConfig {
applicationId "com.aretherecookies"
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 27
versionCode 41
versionName "1.0"
ndk {
@ -139,35 +139,16 @@ android {
}
dependencies {
compile project(':react-native-google-places')
compile project(':react-native-auth0')
// compile(project(":react-native-google-signin")){
// exclude group: "com.google.android.gms"
// }
compile project(':react-native-image-resizer')
compile project(':react-native-facebook-login')
compile project(':react-native-facebook-login')
compile project(':react-native-maps')
compile project(':react-native-vector-icons')
compile project(':react-native-image-picker')
compile(project(':react-native-google-places')) {
exclude group: "com.google.android.gms"
}
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules
// all the gms stuff gotta be the same version
compile ('com.google.android.gms:play-services-auth:10.2.4') {
force = true
}
compile ('com.google.android.gms:play-services-base:10.2.4') {
force = true
}
compile ('com.google.android.gms:play-services-places:10.2.4') {
force = true
}
compile ('com.google.android.gms:play-services-location:10.2.4') {
force = true
}
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.facebook.react:react-native:+'
// From node_modules
}
// Run this once to be able to run the application with BUCK

View file

@ -3,13 +3,13 @@ package com.aretherecookies;
import android.app.Application;
import com.facebook.react.ReactApplication;
import com.arttitude360.reactnative.rngoogleplaces.RNGooglePlacesPackage;
import com.auth0.react.A0Auth0Package;
// import co.apptailor.googlesignin.RNGoogleSigninPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import com.airbnb.android.react.maps.MapsPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.imagepicker.ImagePickerPackage;
import com.arttitude360.reactnative.rngoogleplaces.RNGooglePlacesPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
@ -30,15 +30,15 @@ public class MainApplication extends Application implements ReactApplication {
@Override
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new A0Auth0Package(),
// new RNGoogleSigninPackage(),
new ImageResizerPackage(),
new MapsPackage(),
new VectorIconsPackage(),
new ImagePickerPackage(),
new RNGooglePlacesPackage(),
new FacebookLoginPackage()
new MainReactPackage(),
new RNGooglePlacesPackage(),
new A0Auth0Package(),
// new RNGoogleSigninPackage(),
new ImageResizerPackage(),
new MapsPackage(),
new VectorIconsPackage(),
new ImagePickerPackage(),
new FacebookLoginPackage()
);
}
};

View file

@ -3,23 +3,38 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:3.0.0'
// classpath 'com.google.gms:google-services:3.0.0'
}
}
allprojects {
repositories {
mavenLocal()
jcenter()
maven {
url 'https://maven.google.com'
}
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
jcenter()
}
}
ext {
compileSdkVersion = 27
targetSdkVersion = 27
buildToolsVersion = "27.0.0"
supportLibVersion = "27.0.0"
googlePlayServicesVersion = "15.0.1"
androidMapsUtilsVersion = "0.5+"
}

View file

@ -1,4 +1,6 @@
rootProject.name = 'AreThereCookies'
include ':react-native-google-places'
project(':react-native-google-places').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-places/android')
include ':react-native-auth0'
project(':react-native-auth0').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-auth0/android')
// include ':react-native-google-signin'
@ -13,7 +15,5 @@ include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-image-picker'
project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
include ':react-native-google-places'
project(':react-native-google-places').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-places/android')
include ':app'

View file

@ -35,7 +35,6 @@
2DCD954D1E0B4F2C00145EB5 /* AreThereCookiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AreThereCookiesTests.m */; };
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
280E457CAD9348CA8B03DD47 /* libRNGooglePlaces.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABA925E808304E17AEDC016B /* libRNGooglePlaces.a */; };
6D42E5626E694AD8B2E1F392 /* libRNImagePicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B39ECE2FC3546CDBD026A5B /* libRNImagePicker.a */; };
0BB615C49CCD433DA593C478 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BFB7419F05149A0AA3B5196 /* libRNVectorIcons.a */; };
55FDEE79293C4EFA86063F22 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4D75338FE719450A97754019 /* Entypo.ttf */; };
@ -56,6 +55,7 @@
A1CF0A85A34940CDA949E850 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840A8631BCFC4F9E8370035F /* SystemConfiguration.framework */; };
029B651D0B0E4AE3837F4281 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8F9368F722A4808842C3802 /* AddressBook.framework */; };
5F2AA8F2235A4CD68207EAB7 /* libA0Auth0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55BE16B9C73846718D1F0095 /* libA0Auth0.a */; };
E1F8FA2ADF4A4EC396C4AFE1 /* libRNGooglePlaces.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7AD62EB06284B498A5E9460 /* libRNGooglePlaces.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -275,8 +275,6 @@
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
8A9E50571CB24ACDB143CECA /* RNGooglePlaces.xcodeproj */ = {isa = PBXFileReference; name = "RNGooglePlaces.xcodeproj"; path = "../node_modules/react-native-google-places/ios/RNGooglePlaces.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
ABA925E808304E17AEDC016B /* libRNGooglePlaces.a */ = {isa = PBXFileReference; name = "libRNGooglePlaces.a"; path = "libRNGooglePlaces.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
1CDCCD20971D43E3A647B5AA /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; name = "RNImagePicker.xcodeproj"; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
4B39ECE2FC3546CDBD026A5B /* libRNImagePicker.a */ = {isa = PBXFileReference; name = "libRNImagePicker.a"; path = "libRNImagePicker.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
@ -303,6 +301,8 @@
F8F9368F722A4808842C3802 /* AddressBook.framework */ = {isa = PBXFileReference; name = "AddressBook.framework"; path = "System/Library/Frameworks/AddressBook.framework"; sourceTree = SDKROOT; fileEncoding = undefined; lastKnownFileType = wrapper.framework; explicitFileType = undefined; includeInIndex = 0; };
40366698AD0243C08C474E18 /* A0Auth0.xcodeproj */ = {isa = PBXFileReference; name = "A0Auth0.xcodeproj"; path = "../node_modules/react-native-auth0/ios/A0Auth0.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
55BE16B9C73846718D1F0095 /* libA0Auth0.a */ = {isa = PBXFileReference; name = "libA0Auth0.a"; path = "libA0Auth0.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
6A1C7332790C45828F29BB89 /* RNGooglePlaces.xcodeproj */ = {isa = PBXFileReference; name = "RNGooglePlaces.xcodeproj"; path = "../node_modules/react-native-google-places/ios/RNGooglePlaces.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
A7AD62EB06284B498A5E9460 /* libRNGooglePlaces.a */ = {isa = PBXFileReference; name = "libRNGooglePlaces.a"; path = "libRNGooglePlaces.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -329,7 +329,6 @@
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
280E457CAD9348CA8B03DD47 /* libRNGooglePlaces.a in Frameworks */,
6D42E5626E694AD8B2E1F392 /* libRNImagePicker.a in Frameworks */,
0BB615C49CCD433DA593C478 /* libRNVectorIcons.a in Frameworks */,
58AA5BD96D1F473CAF1D0297 /* libAirMaps.a in Frameworks */,
@ -340,6 +339,7 @@
A1CF0A85A34940CDA949E850 /* SystemConfiguration.framework in Frameworks */,
029B651D0B0E4AE3837F4281 /* AddressBook.framework in Frameworks */,
5F2AA8F2235A4CD68207EAB7 /* libA0Auth0.a in Frameworks */,
E1F8FA2ADF4A4EC396C4AFE1 /* libRNGooglePlaces.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -506,13 +506,13 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
8A9E50571CB24ACDB143CECA /* RNGooglePlaces.xcodeproj */,
1CDCCD20971D43E3A647B5AA /* RNImagePicker.xcodeproj */,
ABBDD4481F9A4A879DC2DA9B /* RNVectorIcons.xcodeproj */,
CA8120963AF94E0FB384289D /* AirMaps.xcodeproj */,
AD5CC2AA6AA04DC680DF530F /* RCTImageResizer.xcodeproj */,
1E238A9449A24833B6FEAEFE /* RNGoogleSignin.xcodeproj */,
40366698AD0243C08C474E18 /* A0Auth0.xcodeproj */,
6A1C7332790C45828F29BB89 /* RNGooglePlaces.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
@ -1083,22 +1083,16 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Debug;
@ -1120,22 +1114,16 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Release;
@ -1157,13 +1145,13 @@
VERSIONING_SYSTEM = "apple-generic";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Debug;
@ -1184,13 +1172,13 @@
VERSIONING_SYSTEM = "apple-generic";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Release;
@ -1221,22 +1209,16 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Debug;
@ -1267,22 +1249,16 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
"$(SRCROOT)/../node_modules/react-native-image-picker/ios",
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
"$(SRCROOT)/../node_modules/react-native-maps/lib/ios/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
"$(SRCROOT)/../node_modules/react-native-google-signin/ios/RNGoogleSignin/**",
"$(SRCROOT)/../node_modules/react-native-auth0/ios",
"$(SRCROOT)/../node_modules/react-native-google-places/ios",
);
};
name = Release;
@ -1308,12 +1284,6 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Debug;
@ -1339,12 +1309,6 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Release;

View file

@ -1,14 +1,12 @@
// @flow
import React from 'react';
import { PropTypes } from 'react';
import { shape, func, string, arrayOf } from 'prop-types';
import Food from './pages/Food';
import Places from './pages/Places';
import Faves from './pages/Faves';
import FoodItemDetail from './pages/FoodItemDetail';
import PlaceDetail from './pages/PlaceDetail';
const { shape, func, string, arrayOf } = PropTypes;
export type Route = {
title: string,
component: React.Component<any, any, any>,

View file

@ -16,8 +16,8 @@
"moment": "^2.19.2",
"query-string": "^5.0.1",
"ramda": "^0.24.1",
"react": "~15.4.1",
"react-native": "~0.42.0",
"react": "16.1.1",
"react-native": "0.50.4",
"react-native-facebook-login": "^1.6.0",
"react-native-google-places": "^2.1.0",
"react-native-google-signin": "0.10",
@ -25,9 +25,9 @@
"react-native-image-resizer": "^1.0.0",
"react-native-loading-spinner-overlay": "^0.5.2",
"react-native-looped-carousel": "^0.1.5",
"react-native-maps": "0.15.1",
"react-native-material-ui": "^1.7.0",
"react-native-vector-icons": "^4.0.0",
"react-native-maps": "0.19.0",
"react-native-material-ui": "1.22.0",
"react-native-vector-icons": "6.0.2",
"react-router-native": "~4.1.0",
"react-router-native-button": "^1.2.0",
"recompose": "^0.23.4",

3593
yarn.lock

File diff suppressed because it is too large Load diff