Skip to content

Commit

Permalink
Bump example project to RN 0.35
Browse files Browse the repository at this point in the history
  • Loading branch information
@oblador
oblador committed Oct 13, 2016
1 parent ea58034 commit 2b19331
Show file tree
Hide file tree
Showing 27 changed files with 92 additions and 166 deletions.
8 changes: 4 additions & 4 deletions Examples/IconExplorer/.flowconfig
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ignore]

# We fork some components by platform.
.*/*.android.js
.*/*[.]android.js

# Ignore templates with `@flow` in header
.*/local-cli/generator.*
Expand Down Expand Up @@ -48,11 +48,11 @@ suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

unsafe.enable_getters_and_setters=true

[version]
^0.30.0
^0.32.0
Empty file modified Examples/IconExplorer/android/app/proguard-rules.pro
100755 → 100644
View file
Empty file.
97 changes: 0 additions & 97 deletions Examples/IconExplorer/android/app/react.gradle
View file

This file was deleted.

16 changes: 12 additions & 4 deletions Examples/IconExplorer/android/app/src/main/AndroidManifest.xml
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.iconexplorer">
package="com.iconexplorer"
android:versionCode="1"
android:versionName="1.0">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="22" />

<application
android:name=".MainApplication"
android:allowBackup="true"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:theme="@style/AppTheme"
android:name=".MainApplication">
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
Binary file removed ...ples/IconExplorer/android/app/src/main/res/drawable-hdpi/android_back_white.png
View file
Binary file not shown.
Binary file removed ...ples/IconExplorer/android/app/src/main/res/drawable-mdpi/android_back_white.png
View file
Binary file not shown.
Binary file removed ...les/IconExplorer/android/app/src/main/res/drawable-xhdpi/android_back_white.png
View file
Binary file not shown.
Binary file removed ...es/IconExplorer/android/app/src/main/res/drawable-xxhdpi/android_back_white.png
View file
Binary file not shown.
Empty file modified Examples/IconExplorer/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified Examples/IconExplorer/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified Examples/IconExplorer/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified Examples/IconExplorer/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified Examples/IconExplorer/android/app/src/main/res/values/strings.xml
100755 → 100644
View file
Empty file.
Empty file modified Examples/IconExplorer/android/app/src/main/res/values/styles.xml
100755 → 100644
View file
Empty file.
8 changes: 8 additions & 0 deletions Examples/IconExplorer/android/keystores/BUCK
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
keystore(
name = 'debug',
store = 'debug.keystore',
properties = 'debug.keystore.properties',
visibility = [
'PUBLIC',
],
)
4 changes: 4 additions & 0 deletions Examples/IconExplorer/android/keystores/debug.keystore.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key.store=debug.keystore
key.alias=androiddebugkey
key.store.password=android
key.alias.password=android
97 changes: 50 additions & 47 deletions ...OS/IconExplorer.xcodeproj/project.pbxproj → ...os/IconExplorer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
5D91F22A1C232BB700F5E6EE /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2221C232BB700F5E6EE /* Entypo.ttf */; };
5D91F22B1C232BB700F5E6EE /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2231C232BB700F5E6EE /* EvilIcons.ttf */; };
5D91F22C1C232BB700F5E6EE /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2241C232BB700F5E6EE /* FontAwesome.ttf */; };
5D91F22D1C232BB700F5E6EE /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2251C232BB700F5E6EE /* Foundation.ttf */; };
5D91F22E1C232BB700F5E6EE /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2261C232BB700F5E6EE /* Ionicons.ttf */; };
5D91F22F1C232BB700F5E6EE /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2271C232BB700F5E6EE /* MaterialIcons.ttf */; };
5D91F2301C232BB700F5E6EE /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2281C232BB700F5E6EE /* Octicons.ttf */; };
5D91F2311C232BB700F5E6EE /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D91F2291C232BB700F5E6EE /* Zocial.ttf */; };
5DE0E9211DAF5D9400617733 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E9191DAF5D9400617733 /* Entypo.ttf */; };
5DE0E9221DAF5D9400617733 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91A1DAF5D9400617733 /* EvilIcons.ttf */; };
5DE0E9231DAF5D9400617733 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91B1DAF5D9400617733 /* FontAwesome.ttf */; };
5DE0E9241DAF5D9400617733 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91C1DAF5D9400617733 /* Foundation.ttf */; };
5DE0E9251DAF5D9400617733 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91D1DAF5D9400617733 /* Ionicons.ttf */; };
5DE0E9261DAF5D9400617733 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91E1DAF5D9400617733 /* MaterialIcons.ttf */; };
5DE0E9271DAF5D9400617733 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E91F1DAF5D9400617733 /* Octicons.ttf */; };
5DE0E9281DAF5D9400617733 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5DE0E9201DAF5D9400617733 /* Zocial.ttf */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -132,17 +132,17 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = IconExplorer/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = IconExplorer/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = IconExplorer/main.m; sourceTree = "<group>"; };
5D91F2221C232BB700F5E6EE /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = "<group>"; };
5D91F2231C232BB700F5E6EE /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = "<group>"; };
5D91F2241C232BB700F5E6EE /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = "<group>"; };
5D91F2251C232BB700F5E6EE /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Foundation.ttf; sourceTree = "<group>"; };
5D91F2261C232BB700F5E6EE /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = "<group>"; };
5D91F2271C232BB700F5E6EE /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = "<group>"; };
5D91F2281C232BB700F5E6EE /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = "<group>"; };
5D91F2291C232BB700F5E6EE /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = "<group>"; };
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.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>"; };
5DE0E9191DAF5D9400617733 /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = "<group>"; };
5DE0E91A1DAF5D9400617733 /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = "<group>"; };
5DE0E91B1DAF5D9400617733 /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = "<group>"; };
5DE0E91C1DAF5D9400617733 /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Foundation.ttf; sourceTree = "<group>"; };
5DE0E91D1DAF5D9400617733 /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = "<group>"; };
5DE0E91E1DAF5D9400617733 /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = "<group>"; };
5DE0E91F1DAF5D9400617733 /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = "<group>"; };
5DE0E9201DAF5D9400617733 /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -257,6 +257,7 @@
13B07FB61A68108700A75B9A /* Info.plist */,
13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
13B07FB71A68108700A75B9A /* main.m */,
5DE0E9181DAF5D9400617733 /* Fonts */,
);
name = IconExplorer;
sourceTree = "<group>";
Expand All @@ -269,17 +270,17 @@
name = Products;
sourceTree = "<group>";
};
5D91F2211C232BB700F5E6EE /* Fonts */ = {
5DE0E9181DAF5D9400617733 /* Fonts */ = {
isa = PBXGroup;
children = (
5D91F2221C232BB700F5E6EE /* Entypo.ttf */,
5D91F2231C232BB700F5E6EE /* EvilIcons.ttf */,
5D91F2241C232BB700F5E6EE /* FontAwesome.ttf */,
5D91F2251C232BB700F5E6EE /* Foundation.ttf */,
5D91F2261C232BB700F5E6EE /* Ionicons.ttf */,
5D91F2271C232BB700F5E6EE /* MaterialIcons.ttf */,
5D91F2281C232BB700F5E6EE /* Octicons.ttf */,
5D91F2291C232BB700F5E6EE /* Zocial.ttf */,
5DE0E9191DAF5D9400617733 /* Entypo.ttf */,
5DE0E91A1DAF5D9400617733 /* EvilIcons.ttf */,
5DE0E91B1DAF5D9400617733 /* FontAwesome.ttf */,
5DE0E91C1DAF5D9400617733 /* Foundation.ttf */,
5DE0E91D1DAF5D9400617733 /* Ionicons.ttf */,
5DE0E91E1DAF5D9400617733 /* MaterialIcons.ttf */,
5DE0E91F1DAF5D9400617733 /* Octicons.ttf */,
5DE0E9201DAF5D9400617733 /* Zocial.ttf */,
);
name = Fonts;
path = "../node_modules/react-native-vector-icons/Fonts";
Expand Down Expand Up @@ -325,7 +326,6 @@
832341AE1AAA6A7D00B99B32 /* Libraries */,
00E356EF1AD99517003FC87E /* IconExplorerTests */,
83CBBA001A601CBA00E9B192 /* Products */,
5D91F2211C232BB700F5E6EE /* Fonts */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand Down Expand Up @@ -540,17 +540,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5D91F2301C232BB700F5E6EE /* Octicons.ttf in Resources */,
008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */,
5D91F22D1C232BB700F5E6EE /* Foundation.ttf in Resources */,
5D91F22E1C232BB700F5E6EE /* Ionicons.ttf in Resources */,
5D91F22A1C232BB700F5E6EE /* Entypo.ttf in Resources */,
5DE0E9261DAF5D9400617733 /* MaterialIcons.ttf in Resources */,
5DE0E9271DAF5D9400617733 /* Octicons.ttf in Resources */,
5DE0E9281DAF5D9400617733 /* Zocial.ttf in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
5D91F2311C232BB700F5E6EE /* Zocial.ttf in Resources */,
5D91F22F1C232BB700F5E6EE /* MaterialIcons.ttf in Resources */,
5D91F22B1C232BB700F5E6EE /* EvilIcons.ttf in Resources */,
5DE0E9231DAF5D9400617733 /* FontAwesome.ttf in Resources */,
5DE0E9221DAF5D9400617733 /* EvilIcons.ttf in Resources */,
5DE0E9251DAF5D9400617733 /* Ionicons.ttf in Resources */,
5DE0E9241DAF5D9400617733 /* Foundation.ttf in Resources */,
5DE0E9211DAF5D9400617733 /* Entypo.ttf in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
5D91F22C1C232BB700F5E6EE /* FontAwesome.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -624,7 +623,7 @@
"$(inherited)",
);
INFOPLIST_FILE = IconExplorerTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IconExplorer.app/IconExplorer";
Expand All @@ -637,7 +636,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = IconExplorerTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IconExplorer.app/IconExplorer";
Expand All @@ -648,6 +647,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -656,32 +656,35 @@
);
INFOPLIST_FILE = "IconExplorer/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
"-ObjC",
"-lc++",
);
PRODUCT_NAME = IconExplorer;
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
13B07F951A680F5B00A75B9A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = 1;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**",
);
INFOPLIST_FILE = "IconExplorer/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_LDFLAGS = (
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
);
"-ObjC",
"-lc++",
);
PRODUCT_NAME = IconExplorer;
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
Expand Down Expand Up @@ -724,7 +727,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -764,7 +767,7 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(SRCROOT)/../node_modules/react-native/React/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
0 ...hareddata/xcschemes/IconExplorer.xcscheme → ...hareddata/xcschemes/IconExplorer.xcscheme
View file
File renamed without changes.
0 ...onExplorer/iOS/IconExplorer/AppDelegate.h → ...onExplorer/ios/IconExplorer/AppDelegate.h
View file
File renamed without changes.
0 ...onExplorer/iOS/IconExplorer/AppDelegate.m → ...onExplorer/ios/IconExplorer/AppDelegate.m
View file
File renamed without changes.
0 .../IconExplorer/Base.lproj/LaunchScreen.xib → .../IconExplorer/Base.lproj/LaunchScreen.xib
View file
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
File renamed without changes.
Loading

0 comments on commit 2b19331

Please sign in to comment.