From 0fabdcfacc6e2f47a64e948fe0a3267412fc4cdd Mon Sep 17 00:00:00 2001 From: Rui Ying Date: Sun, 28 Apr 2019 12:20:04 +0800 Subject: [PATCH] Update project --- android/app/BUCK | 18 +++---------- android/app/src/debug/AndroidManifest.xml | 8 ++++++ android/app/src/debug/res/values/strings.xml | 2 +- android/app/src/main/AndroidManifest.xml | 25 +------------------ .../io/robertying/learnx/MainApplication.java | 15 ++--------- android/app/src/release/AndroidManifest.xml | 9 ------- android/build.gradle | 11 -------- android/gradle.properties | 4 +-- fastlane/Fastfile | 2 +- ios/learnX.xcodeproj/project.pbxproj | 11 ++++---- ios/learnX/Info.plist | 4 +-- yarn.lock | 18 ++++++------- 12 files changed, 35 insertions(+), 92 deletions(-) create mode 100644 android/app/src/debug/AndroidManifest.xml delete mode 100644 android/app/src/release/AndroidManifest.xml diff --git a/android/app/BUCK b/android/app/BUCK index 0f3d08ce..5ef6cce1 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -8,23 +8,13 @@ # - `buck install -r android/app` - compile, install and run application # +load(":build_defs.bzl", "create_aar_targets", "create_jar_targets") + lib_deps = [] -for jarfile in glob(['libs/*.jar']): - name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')] - lib_deps.append(':' + name) - prebuilt_jar( - name = name, - binary_jar = jarfile, - ) +create_aar_targets(glob(["libs/*.aar"])) -for aarfile in glob(['libs/*.aar']): - name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')] - lib_deps.append(':' + name) - android_prebuilt_aar( - name = name, - aar = aarfile, - ) +create_jar_targets(glob(["libs/*.jar"])) android_library( name = "all-libs", diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..fa26aa56 --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/android/app/src/debug/res/values/strings.xml b/android/app/src/debug/res/values/strings.xml index 05ae5b68..a13a6584 100644 --- a/android/app/src/debug/res/values/strings.xml +++ b/android/app/src/debug/res/values/strings.xml @@ -1,3 +1,3 @@ - learnX-Debug + learnX-debug diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7420e3ff..ccc05071 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,28 +2,6 @@ package="io.robertying.learnx"> - - - - - - - - + android:theme="@style/AppTheme"> asList( - new ReactAdapterPackage(), - new ConstantsPackage(), - new PermissionsPackage(), - new FileSystemPackage(), - new SecureStorePackage() - ), Arrays.asList()); + private final ReactModuleRegistryProvider mModuleRegistryProvider = new ReactModuleRegistryProvider(new BasePackageList().getPackageList(), Arrays.asList()); private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { diff --git a/android/app/src/release/AndroidManifest.xml b/android/app/src/release/AndroidManifest.xml deleted file mode 100644 index 97aabf7e..00000000 --- a/android/app/src/release/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/android/build.gradle b/android/build.gradle index 229dbf53..982d19f9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -30,14 +30,3 @@ allprojects { } } } - -subprojects { - afterEvaluate {project -> - if (project.hasProperty("android")) { - android { - compileSdkVersion 28 - buildToolsVersion "28.0.2" - } - } - } -} diff --git a/android/gradle.properties b/android/gradle.properties index fc856de9..9c81686b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ -#Sat, 27 Apr 2019 15:48:41 +0800 +#Sun, 28 Apr 2019 12:14:01 +0800 # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: @@ -18,4 +18,4 @@ org.gradle.jvmargs=-Xmx2g -XX\:MaxMetaspaceSize\=512m -XX\:+HeapDumpOnOutOfMemor # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_CODE=19 +VERSION_CODE=20 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3a6851f2..7ad88b4e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,7 +17,7 @@ platform :ios do lane :build do certificates increment_build_number(xcodeproj: 'ios/learnX.xcodeproj') - gym(scheme: 'learnX', workspace: 'ios/learnX.xcworkspace') + gym(scheme: 'learnX', workspace: 'ios/learnX.xcworkspace', silent: true) end desc 'Ship to Testflight.' diff --git a/ios/learnX.xcodeproj/project.pbxproj b/ios/learnX.xcodeproj/project.pbxproj index 78fb260f..6d9212a9 100644 --- a/ios/learnX.xcodeproj/project.pbxproj +++ b/ios/learnX.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Assets.xcassets */; }; @@ -15,6 +14,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; 0479951E612F49BBA725A325 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; 0A523C037D474BD8992853F6 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; 0AF899CD44B542399BA66EBB /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; @@ -27,7 +27,6 @@ 28FC3F1739E54958888ACC25 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3FC8248E3E74486EA6818941 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; - 443FA5B275874ED871E76062 /* Pods-learnXTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-learnXTests.debug.xcconfig"; path = "Target Support Files/Pods-learnXTests/Pods-learnXTests.debug.xcconfig"; sourceTree = ""; }; 490051384AF4472F8A9F7980 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; 59F216114CA3551F20AC00A2 /* Pods-learnX.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-learnX.staging.xcconfig"; path = "Target Support Files/Pods-learnX/Pods-learnX.staging.xcconfig"; sourceTree = ""; }; 5C2616418AE84CAE8A6D5327 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; @@ -35,7 +34,6 @@ 813616FCFA4B470283F47A5A /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; A6BDE4FBB80E444559DC5F08 /* libPods-learnX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-learnX.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B5BA1E9CEE0746FE93C5580D /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - BA0F45B70E76EA4C96EFCFEF /* Pods-learnXTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-learnXTests.release.xcconfig"; path = "Target Support Files/Pods-learnXTests/Pods-learnXTests.release.xcconfig"; sourceTree = ""; }; C46F3667AE2D5E49A2253C9E /* Pods-learnX.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-learnX.debug.xcconfig"; path = "Target Support Files/Pods-learnX/Pods-learnX.debug.xcconfig"; sourceTree = ""; }; C904C302C1D466306290CFB2 /* Pods-learnX.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-learnX.release.xcconfig"; path = "Target Support Files/Pods-learnX/Pods-learnX.release.xcconfig"; sourceTree = ""; }; CE248A3AEAD54031B5620049 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; @@ -63,6 +61,7 @@ 13B07FAE1A68108700A75B9A /* learnX */ = { isa = PBXGroup; children = ( + 008F07F21AC5B25A0029DE68 /* main.jsbundle */, D4BC73F922734DD30079635A /* LaunchScreen.storyboard */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, 13B07FB01A68108700A75B9A /* AppDelegate.m */, @@ -358,7 +357,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = QX9PZ6H89F; HEADER_SEARCH_PATHS = "$(inherited)"; @@ -385,7 +384,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = QX9PZ6H89F; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -569,7 +568,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = QX9PZ6H89F; HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/learnX/Info.plist b/ios/learnX/Info.plist index b3aa7a45..5a2f2363 100644 --- a/ios/learnX/Info.plist +++ b/ios/learnX/Info.plist @@ -19,9 +19,9 @@ CFBundleShortVersionString 2.0.0 CFBundleSignature - + CFBundleVersion - 19 + 20 CodePushDeploymentKey $(CODEPUSH_KEY) Fabric diff --git a/yarn.lock b/yarn.lock index b91afb9c..3bfa0fb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4939,9 +4939,9 @@ node-fetch@^1.0.1: is-stream "^1.0.1" node-fetch@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.4.0.tgz#125ae2b0c2a75cb3b2ed141bf73e106cfe1f0ca8" - integrity sha512-1mt8bw5JQWWTcwUM1FGjFJLFo5lB/jz6zbm+qwdEh2iqYobKS4aHWgz1d+mvho5cqCaShFDF+hnpgraIi/5tqA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.4.1.tgz#b2e38f1117b8acbedbe0524f041fb3177188255d" + integrity sha512-P9UbpFK87NyqBZzUuDBDz4f6Yiys8xm8j7ACDbi6usvFm6KItklQUKjeoqTrYS/S1k6I8oaOC2YLLDr/gg26Mw== node-int64@^0.4.0: version "0.4.0" @@ -6048,9 +6048,9 @@ read-pkg@^3.0.0: path-type "^3.0.0" read-pkg@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.0.tgz#62b924384c4525a1a7a96e2d456b80df142b4390" - integrity sha512-NjNkqf8hlMuSxh+p8h8x8sCIfEv/MoRs/nYDmSRSAk879F9C94ADq+kHUJ4LTy5Nn0PYSmMYsy1mD4+lcXiBKg== + version "5.1.1" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5" + integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w== dependencies: "@types/normalize-package-data" "^2.4.0" normalize-package-data "^2.5.0" @@ -7256,9 +7256,9 @@ uglify-es@^3.1.9: source-map "~0.6.1" uglify-js@^3.1.4: - version "3.5.8" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.8.tgz#496f62a8c23c3e6791563acbc04908edaca4025f" - integrity sha512-GFSjB1nZIzoIq70qvDRtWRORHX3vFkAnyK/rDExc0BN7r9+/S+Voz3t/fwJuVfjppAMz+ceR2poE7tkhvnVwQQ== + version "3.5.9" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.9.tgz#372fbf95939555b1f460b1777d33a67d4a994ac9" + integrity sha512-WpT0RqsDtAWPNJK955DEnb6xjymR8Fn0OlK4TT4pS0ASYsVPqr5ELhgwOwLCP5J5vHeJ4xmMmz3DEgdqC10JeQ== dependencies: commander "~2.20.0" source-map "~0.6.1"