diff --git a/Examples/IconExplorer/.flowconfig b/Examples/IconExplorer/.flowconfig index b69d071..f565799 100644 --- a/Examples/IconExplorer/.flowconfig +++ b/Examples/IconExplorer/.flowconfig @@ -1,7 +1,7 @@ [ignore] # We fork some components by platform. -.*/*.android.js +.*/*[.]android.js # Ignore templates with `@flow` in header .*/local-cli/generator.* @@ -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 diff --git a/Examples/IconExplorer/android/app/proguard-rules.pro b/Examples/IconExplorer/android/app/proguard-rules.pro old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/react.gradle b/Examples/IconExplorer/android/app/react.gradle deleted file mode 100644 index 11a4f8b..0000000 --- a/Examples/IconExplorer/android/app/react.gradle +++ /dev/null @@ -1,97 +0,0 @@ -import org.apache.tools.ant.taskdefs.condition.Os - -def config = project.hasProperty("react") ? project.react : []; - -def bundleAssetName = config.bundleAssetName ?: "index.android.bundle" -def entryFile = config.entryFile ?: "index.android.js" - -// because elvis operator -def elvisFile(thing) { - return thing ? file(thing) : null; -} - -def reactRoot = elvisFile(config.root) ?: file("../../") -def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"] - -void runBefore(String dependentTaskName, Task task) { - Task dependentTask = tasks.findByPath(dependentTaskName); - if (dependentTask != null) { - dependentTask.dependsOn task - } -} - -gradle.projectsEvaluated { - // Grab all build types and product flavors - def buildTypes = android.buildTypes.collect { type -> type.name } - def productFlavors = android.productFlavors.collect { flavor -> flavor.name } - - // When no product flavors defined, use empty - if (!productFlavors) productFlavors.add('') - - productFlavors.each { productFlavorName -> - buildTypes.each { buildTypeName -> - // Create variant and target names - def targetName = "${productFlavorName.capitalize()}${buildTypeName.capitalize()}" - def targetPath = productFlavorName ? - "${productFlavorName}/${buildTypeName}" : - "${buildTypeName}" - - // React js bundle directories - def jsBundleDirConfigName = "jsBundleDir${targetName}" - def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?: - file("$buildDir/intermediates/assets/${targetPath}") - - def resourcesDirConfigName = "jsBundleDir${targetName}" - def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?: - file("$buildDir/intermediates/res/merged/${targetPath}") - def jsBundleFile = file("$jsBundleDir/$bundleAssetName") - - // Bundle task name for variant - def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets" - - def currentBundleTask = tasks.create( - name: bundleJsAndAssetsTaskName, - type: Exec) { - group = "react" - description = "bundle JS and assets for ${targetName}." - - // Create dirs if they are not there (e.g. the "clean" task just ran) - doFirst { - jsBundleDir.mkdirs() - resourcesDir.mkdirs() - } - - // Set up inputs and outputs so gradle can cache the result - inputs.files fileTree(dir: reactRoot, excludes: inputExcludes) - outputs.dir jsBundleDir - outputs.dir resourcesDir - - // Set up the call to the react-native cli - workingDir reactRoot - - // Set up dev mode - def devEnabled = !targetName.toLowerCase().contains("release") - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "${devEnabled}", - "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir - } else { - commandLine "react-native", "bundle", "--platform", "android", "--dev", "${devEnabled}", - "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir - } - - enabled config."bundleIn${targetName}" || - config."bundleIn${buildTypeName.capitalize()}" ?: - targetName.toLowerCase().contains("release") - } - - // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process - currentBundleTask.dependsOn("merge${targetName}Resources") - currentBundleTask.dependsOn("merge${targetName}Assets") - - runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask) - runBefore("processX86${targetName}Resources", currentBundleTask) - runBefore("processUniversal${targetName}Resources", currentBundleTask) - runBefore("process${targetName}Resources", currentBundleTask) - } - } -} diff --git a/Examples/IconExplorer/android/app/src/main/AndroidManifest.xml b/Examples/IconExplorer/android/app/src/main/AndroidManifest.xml old mode 100755 new mode 100644 index 6564c58..1a35467 --- a/Examples/IconExplorer/android/app/src/main/AndroidManifest.xml +++ b/Examples/IconExplorer/android/app/src/main/AndroidManifest.xml @@ -1,17 +1,25 @@ + package="com.iconexplorer" + android:versionCode="1" + android:versionName="1.0"> + + + + android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:configChanges="keyboard|keyboardHidden|orientation|screenSize"> diff --git a/Examples/IconExplorer/android/app/src/main/res/drawable-hdpi/android_back_white.png b/Examples/IconExplorer/android/app/src/main/res/drawable-hdpi/android_back_white.png deleted file mode 100644 index a34f0db..0000000 Binary files a/Examples/IconExplorer/android/app/src/main/res/drawable-hdpi/android_back_white.png and /dev/null differ diff --git a/Examples/IconExplorer/android/app/src/main/res/drawable-mdpi/android_back_white.png b/Examples/IconExplorer/android/app/src/main/res/drawable-mdpi/android_back_white.png deleted file mode 100644 index 6311159..0000000 Binary files a/Examples/IconExplorer/android/app/src/main/res/drawable-mdpi/android_back_white.png and /dev/null differ diff --git a/Examples/IconExplorer/android/app/src/main/res/drawable-xhdpi/android_back_white.png b/Examples/IconExplorer/android/app/src/main/res/drawable-xhdpi/android_back_white.png deleted file mode 100644 index 500892e..0000000 Binary files a/Examples/IconExplorer/android/app/src/main/res/drawable-xhdpi/android_back_white.png and /dev/null differ diff --git a/Examples/IconExplorer/android/app/src/main/res/drawable-xxhdpi/android_back_white.png b/Examples/IconExplorer/android/app/src/main/res/drawable-xxhdpi/android_back_white.png deleted file mode 100644 index 0362097..0000000 Binary files a/Examples/IconExplorer/android/app/src/main/res/drawable-xxhdpi/android_back_white.png and /dev/null differ diff --git a/Examples/IconExplorer/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Examples/IconExplorer/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Examples/IconExplorer/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Examples/IconExplorer/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Examples/IconExplorer/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/src/main/res/values/strings.xml b/Examples/IconExplorer/android/app/src/main/res/values/strings.xml old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/app/src/main/res/values/styles.xml b/Examples/IconExplorer/android/app/src/main/res/values/styles.xml old mode 100755 new mode 100644 diff --git a/Examples/IconExplorer/android/keystores/BUCK b/Examples/IconExplorer/android/keystores/BUCK new file mode 100644 index 0000000..15da20e --- /dev/null +++ b/Examples/IconExplorer/android/keystores/BUCK @@ -0,0 +1,8 @@ +keystore( + name = 'debug', + store = 'debug.keystore', + properties = 'debug.keystore.properties', + visibility = [ + 'PUBLIC', + ], +) diff --git a/Examples/IconExplorer/android/keystores/debug.keystore.properties b/Examples/IconExplorer/android/keystores/debug.keystore.properties new file mode 100644 index 0000000..121bfb4 --- /dev/null +++ b/Examples/IconExplorer/android/keystores/debug.keystore.properties @@ -0,0 +1,4 @@ +key.store=debug.keystore +key.alias=androiddebugkey +key.store.password=android +key.alias.password=android diff --git a/Examples/IconExplorer/iOS/IconExplorer.xcodeproj/project.pbxproj b/Examples/IconExplorer/ios/IconExplorer.xcodeproj/project.pbxproj similarity index 91% rename from Examples/IconExplorer/iOS/IconExplorer.xcodeproj/project.pbxproj rename to Examples/IconExplorer/ios/IconExplorer.xcodeproj/project.pbxproj index e601eb6..4ea9273 100644 --- a/Examples/IconExplorer/iOS/IconExplorer.xcodeproj/project.pbxproj +++ b/Examples/IconExplorer/ios/IconExplorer.xcodeproj/project.pbxproj @@ -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 */ @@ -132,17 +132,17 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = IconExplorer/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = IconExplorer/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = IconExplorer/main.m; sourceTree = ""; }; - 5D91F2221C232BB700F5E6EE /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = ""; }; - 5D91F2231C232BB700F5E6EE /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = ""; }; - 5D91F2241C232BB700F5E6EE /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; - 5D91F2251C232BB700F5E6EE /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Foundation.ttf; sourceTree = ""; }; - 5D91F2261C232BB700F5E6EE /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = ""; }; - 5D91F2271C232BB700F5E6EE /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = ""; }; - 5D91F2281C232BB700F5E6EE /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = ""; }; - 5D91F2291C232BB700F5E6EE /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; + 5DE0E9191DAF5D9400617733 /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Entypo.ttf; sourceTree = ""; }; + 5DE0E91A1DAF5D9400617733 /* EvilIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = EvilIcons.ttf; sourceTree = ""; }; + 5DE0E91B1DAF5D9400617733 /* FontAwesome.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontAwesome.ttf; sourceTree = ""; }; + 5DE0E91C1DAF5D9400617733 /* Foundation.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Foundation.ttf; sourceTree = ""; }; + 5DE0E91D1DAF5D9400617733 /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = ""; }; + 5DE0E91E1DAF5D9400617733 /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = ""; }; + 5DE0E91F1DAF5D9400617733 /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = ""; }; + 5DE0E9201DAF5D9400617733 /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -257,6 +257,7 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, + 5DE0E9181DAF5D9400617733 /* Fonts */, ); name = IconExplorer; sourceTree = ""; @@ -269,17 +270,17 @@ name = Products; sourceTree = ""; }; - 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"; @@ -325,7 +326,6 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* IconExplorerTests */, 83CBBA001A601CBA00E9B192 /* Products */, - 5D91F2211C232BB700F5E6EE /* Fonts */, ); indentWidth = 2; sourceTree = ""; @@ -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; }; @@ -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"; @@ -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"; @@ -648,6 +647,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -656,12 +656,13 @@ ); 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; }; @@ -669,6 +670,7 @@ 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, @@ -676,12 +678,13 @@ ); 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; }; @@ -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; @@ -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; diff --git a/Examples/IconExplorer/iOS/IconExplorer.xcodeproj/xcshareddata/xcschemes/IconExplorer.xcscheme b/Examples/IconExplorer/ios/IconExplorer.xcodeproj/xcshareddata/xcschemes/IconExplorer.xcscheme similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer.xcodeproj/xcshareddata/xcschemes/IconExplorer.xcscheme rename to Examples/IconExplorer/ios/IconExplorer.xcodeproj/xcshareddata/xcschemes/IconExplorer.xcscheme diff --git a/Examples/IconExplorer/iOS/IconExplorer/AppDelegate.h b/Examples/IconExplorer/ios/IconExplorer/AppDelegate.h similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/AppDelegate.h rename to Examples/IconExplorer/ios/IconExplorer/AppDelegate.h diff --git a/Examples/IconExplorer/iOS/IconExplorer/AppDelegate.m b/Examples/IconExplorer/ios/IconExplorer/AppDelegate.m similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/AppDelegate.m rename to Examples/IconExplorer/ios/IconExplorer/AppDelegate.m diff --git a/Examples/IconExplorer/iOS/IconExplorer/Base.lproj/LaunchScreen.xib b/Examples/IconExplorer/ios/IconExplorer/Base.lproj/LaunchScreen.xib similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/Base.lproj/LaunchScreen.xib rename to Examples/IconExplorer/ios/IconExplorer/Base.lproj/LaunchScreen.xib diff --git a/Examples/IconExplorer/iOS/IconExplorer/Images.xcassets/AppIcon.appiconset/Contents.json b/Examples/IconExplorer/ios/IconExplorer/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/Images.xcassets/AppIcon.appiconset/Contents.json rename to Examples/IconExplorer/ios/IconExplorer/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Examples/IconExplorer/iOS/IconExplorer/Info.plist b/Examples/IconExplorer/ios/IconExplorer/Info.plist similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/Info.plist rename to Examples/IconExplorer/ios/IconExplorer/Info.plist index a2668e1..97d68bf 100644 --- a/Examples/IconExplorer/iOS/IconExplorer/Info.plist +++ b/Examples/IconExplorer/ios/IconExplorer/Info.plist @@ -2,17 +2,6 @@ - UIAppFonts - - Entypo.ttf - EvilIcons.ttf - FontAwesome.ttf - Foundation.ttf - Ionicons.ttf - MaterialIcons.ttf - Octicons.ttf - Zocial.ttf - CFBundleDevelopmentRegion en CFBundleExecutable @@ -33,6 +22,17 @@ 1 LSRequiresIPhoneOS + UIAppFonts + + Entypo.ttf + EvilIcons.ttf + FontAwesome.ttf + Foundation.ttf + Ionicons.ttf + MaterialIcons.ttf + Octicons.ttf + Zocial.ttf + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities diff --git a/Examples/IconExplorer/iOS/IconExplorer/main.m b/Examples/IconExplorer/ios/IconExplorer/main.m similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorer/main.m rename to Examples/IconExplorer/ios/IconExplorer/main.m diff --git a/Examples/IconExplorer/iOS/IconExplorerTests/IconExplorerTests.m b/Examples/IconExplorer/ios/IconExplorerTests/IconExplorerTests.m similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorerTests/IconExplorerTests.m rename to Examples/IconExplorer/ios/IconExplorerTests/IconExplorerTests.m diff --git a/Examples/IconExplorer/iOS/IconExplorerTests/Info.plist b/Examples/IconExplorer/ios/IconExplorerTests/Info.plist similarity index 100% rename from Examples/IconExplorer/iOS/IconExplorerTests/Info.plist rename to Examples/IconExplorer/ios/IconExplorerTests/Info.plist diff --git a/Examples/IconExplorer/package.json b/Examples/IconExplorer/package.json index 8644d83..73c76dd 100644 --- a/Examples/IconExplorer/package.json +++ b/Examples/IconExplorer/package.json @@ -3,12 +3,12 @@ "version": "0.0.1", "private": true, "scripts": { - "start": "node_modules/react-native/packager/packager.sh" + "start": "node node_modules/react-native/local-cli/cli.js start" }, "dependencies": { "lodash": "^4.0.0", - "react": "~15.3.0", - "react-native": "^0.32.0-rc.0", + "react": "15.3.2", + "react-native": "0.35.0", "react-native-vector-icons": "file:../../" } }