From cc381fa1f0e52dce1cb0bbf2b5143cf821dedd99 Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 7 Jun 2021 15:44:58 +0200 Subject: [PATCH 1/4] Use same folder structure as v2.5.6 of main repo for iOS project --- BVLinearGradient.podspec | 4 ++-- .../project.pbxproj | 12 ++++++------ {ios => BVLinearGradient}/BVLinearGradient.h | 0 {ios => BVLinearGradient}/BVLinearGradient.m | 0 {ios => BVLinearGradient}/BVLinearGradientLayer.h | 0 {ios => BVLinearGradient}/BVLinearGradientLayer.m | 0 {ios => BVLinearGradient}/BVLinearGradientManager.h | 0 {ios => BVLinearGradient}/BVLinearGradientManager.m | 0 ios/.npmignore | 6 ------ 9 files changed, 8 insertions(+), 14 deletions(-) rename {ios/BVLinearGradient.xcodeproj => BVLinearGradient.xcodeproj}/project.pbxproj (95%) rename {ios => BVLinearGradient}/BVLinearGradient.h (100%) rename {ios => BVLinearGradient}/BVLinearGradient.m (100%) rename {ios => BVLinearGradient}/BVLinearGradientLayer.h (100%) rename {ios => BVLinearGradient}/BVLinearGradientLayer.m (100%) rename {ios => BVLinearGradient}/BVLinearGradientManager.h (100%) rename {ios => BVLinearGradient}/BVLinearGradientManager.m (100%) delete mode 100644 ios/.npmignore diff --git a/BVLinearGradient.podspec b/BVLinearGradient.podspec index 3b954368..5700e030 100644 --- a/BVLinearGradient.podspec +++ b/BVLinearGradient.podspec @@ -9,10 +9,10 @@ Pod::Spec.new do |s| s.summary = "A component for react-native" s.license = "MIT" s.author = { "Brent Vatne" => "brentvatne@gmail.com" } - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '7.0' s.tvos.deployment_target = '9.0' s.source = { :git => "https://github.com/brentvatne/react-native-linear-gradient.git", :tag => "v#{s.version}" } - s.source_files = 'ios/*.{h,m}' + s.source_files = 'BVLinearGradient/*.{h,m}' s.preserve_paths = "**/*.js" s.frameworks = 'UIKit', 'QuartzCore', 'Foundation' diff --git a/ios/BVLinearGradient.xcodeproj/project.pbxproj b/BVLinearGradient.xcodeproj/project.pbxproj similarity index 95% rename from ios/BVLinearGradient.xcodeproj/project.pbxproj rename to BVLinearGradient.xcodeproj/project.pbxproj index b00e2c07..e1e7380f 100644 --- a/ios/BVLinearGradient.xcodeproj/project.pbxproj +++ b/BVLinearGradient.xcodeproj/project.pbxproj @@ -35,12 +35,12 @@ /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBVLinearGradient.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 21A8AA16239A7C7500B411EC /* BVLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVLinearGradient.h; sourceTree = ""; }; - 21A8AA17239A7C7500B411EC /* BVLinearGradientManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVLinearGradientManager.h; sourceTree = ""; }; - 21A8AA18239A7C7500B411EC /* BVLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradient.m; sourceTree = ""; }; - 21A8AA19239A7C7600B411EC /* BVLinearGradientManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradientManager.m; sourceTree = ""; }; - 21A8AA1A239A7C7600B411EC /* BVLinearGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BVLinearGradientLayer.m; sourceTree = ""; }; - 21A8AA1B239A7C7600B411EC /* BVLinearGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BVLinearGradientLayer.h; sourceTree = ""; }; + 21A8AA16239A7C7500B411EC /* BVLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVLinearGradient.h; path = BVLinearGradient/BVLinearGradient.h; sourceTree = ""; }; + 21A8AA17239A7C7500B411EC /* BVLinearGradientManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVLinearGradientManager.h; path = BVLinearGradient/BVLinearGradientManager.h; sourceTree = ""; }; + 21A8AA18239A7C7500B411EC /* BVLinearGradient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVLinearGradient.m; path = BVLinearGradient/BVLinearGradient.m; sourceTree = ""; }; + 21A8AA19239A7C7600B411EC /* BVLinearGradientManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVLinearGradientManager.m; path = BVLinearGradient/BVLinearGradientManager.m; sourceTree = ""; }; + 21A8AA1A239A7C7600B411EC /* BVLinearGradientLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BVLinearGradientLayer.m; path = BVLinearGradient/BVLinearGradientLayer.m; sourceTree = ""; }; + 21A8AA1B239A7C7600B411EC /* BVLinearGradientLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BVLinearGradientLayer.h; path = BVLinearGradient/BVLinearGradientLayer.h; sourceTree = ""; }; 64AA15081EF7F30100718508 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBVLinearGradient.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ diff --git a/ios/BVLinearGradient.h b/BVLinearGradient/BVLinearGradient.h similarity index 100% rename from ios/BVLinearGradient.h rename to BVLinearGradient/BVLinearGradient.h diff --git a/ios/BVLinearGradient.m b/BVLinearGradient/BVLinearGradient.m similarity index 100% rename from ios/BVLinearGradient.m rename to BVLinearGradient/BVLinearGradient.m diff --git a/ios/BVLinearGradientLayer.h b/BVLinearGradient/BVLinearGradientLayer.h similarity index 100% rename from ios/BVLinearGradientLayer.h rename to BVLinearGradient/BVLinearGradientLayer.h diff --git a/ios/BVLinearGradientLayer.m b/BVLinearGradient/BVLinearGradientLayer.m similarity index 100% rename from ios/BVLinearGradientLayer.m rename to BVLinearGradient/BVLinearGradientLayer.m diff --git a/ios/BVLinearGradientManager.h b/BVLinearGradient/BVLinearGradientManager.h similarity index 100% rename from ios/BVLinearGradientManager.h rename to BVLinearGradient/BVLinearGradientManager.h diff --git a/ios/BVLinearGradientManager.m b/BVLinearGradient/BVLinearGradientManager.m similarity index 100% rename from ios/BVLinearGradientManager.m rename to BVLinearGradient/BVLinearGradientManager.m diff --git a/ios/.npmignore b/ios/.npmignore deleted file mode 100644 index aacee6de..00000000 --- a/ios/.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -*/project.xcworkspace/ -*/xcuserdata/ -.DS_Store -.npmignore -Pods/ -build/ From 2369d070a31d35b911a77db53a55e57f98cc010b Mon Sep 17 00:00:00 2001 From: Ceyhun Ozugur Date: Mon, 7 Jun 2021 16:35:03 +0200 Subject: [PATCH 2/4] Update package.json and .npmignore from main repo's v2.5.6 --- .npmignore | 13 +++++++++++++ package.json | 24 +++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.npmignore b/.npmignore index a8d52f4d..e9bcc061 100644 --- a/.npmignore +++ b/.npmignore @@ -1 +1,14 @@ +node_modules/**/* +build +BVLinearGradient.xcodeproj/xcuserdata/**/* +BVLinearGradient.xcodeproj/project.xcworkspace/**/* +.idea +.gradle/ +gradlew +gradlew.bat +gradle/ +*.properties +*.iml +npm-debug.log Examples/ +images/ diff --git a/package.json b/package.json index 252cc6c5..0ef1f657 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,7 @@ "name": "react-native-linear-gradient", "version": "2.5.6", "description": "A element for React Native", - "main": "index.js", - "files": [ - "android", - "ios", - "windows", - "common.js", - "index.android.js", - "index.d.ts", - "index.ios.js", - "index.windows.js", - "BVLinearGradient.podspec" - ], + "main": "index", "author": { "name": "Brent Vatne", "email": "brentvatne@gmail.com", @@ -48,15 +37,16 @@ }, "dependencies": {}, "peerDependencies": { - "react": "^16.8.1", "react-native": ">=0.55" }, "devDependencies": { - "flow-bin": "^0.98", - "react": "16.8.6", - "react-native": "0.60.5" + "flow-bin": "^0.92", + "react": "^16.8.3", + "react-native": "^0.59.1" }, "scripts": { - "flow": "flow check" + "flow": "yarn flow:android && yarn flow:ios", + "flow:android": "flow check --flowconfig-name .flowconfig.android", + "flow:ios": "flow check" } } From 71e2c260c3622deeefbbcb84eb5f351302c8c18c Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Mon, 7 Jun 2021 09:49:38 -0700 Subject: [PATCH 3/4] Updated react native mirror source from bintray to S3 --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 8d0d1552..49218a6c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -44,7 +44,7 @@ repositories { jcenter() mavenCentral() maven { - url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" + url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" } } @@ -56,4 +56,4 @@ dependencies { //noinspection GradleDynamicVersion api "com.facebook.react:react-native:+" } -} \ No newline at end of file +} From deafc7a7b3dcfdc2a2d8327b5727cb393f1cabf7 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Mon, 7 Jun 2021 09:51:10 -0700 Subject: [PATCH 4/4] Update react-native dependency to 0.64.0 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 49218a6c..ac579140 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -51,7 +51,7 @@ repositories { dependencies { if (project == rootProject) { // If this is the root project (e.g. Jitpack), specify a version - implementation 'com.facebook.react:react-native:0.60.0-rc.1' + implementation 'com.facebook.react:react-native:0.64.0' } else { //noinspection GradleDynamicVersion api "com.facebook.react:react-native:+"