matrixbirds vor 5 Jahren
Ursprung
Commit
c146343e7c

+ 1
- 0
.gitignore Datei anzeigen

@@ -64,3 +64,4 @@ xcuserdata
64 64
 lib
65 65
 *.xcworkspace
66 66
 *.zip
67
+.byebug_history

+ 8386
- 0
package-lock.json
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 8
- 4
package.json Datei anzeigen

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "name": "react-native-agora",
3
-  "version": "1.2.5",
3
+  "version": "2.3.3",
4 4
   "description": "声网Agora",
5 5
   "summary": "agora native sdk for react-native",
6 6
   "main": "lib/index.js",
@@ -25,7 +25,9 @@
25 25
     "react-native-video"
26 26
   ],
27 27
   "author": "syanbo",
28
-  "authors": ["https://github.com/syanbo/react-native-agora/graphs/contributors"],
28
+  "authors": [
29
+    "https://github.com/syanbo/react-native-agora/graphs/contributors"
30
+  ],
29 31
   "license": "MIT",
30 32
   "bugs": {
31 33
     "url": "https://github.com/syanbo/react-native-agora/issues"
@@ -33,15 +35,17 @@
33 35
   "homepage": "https://github.com/syanbo/react-native-agora#readme",
34 36
   "peerDependencies": {
35 37
     "react": "16.3.0",
36
-    "react-native": "0.57.8"
38
+    "react-native": "0.57.8",
39
+    "tslib": "latest"
37 40
   },
38 41
   "devDependencies": {
42
+    "react": "^16.7.0",
43
+    "react-native": "^0.58.3",
39 44
     "@types/jest": "^23.3.13",
40 45
     "@types/react": "^16.7.20",
41 46
     "@types/react-native": "^0.57.31",
42 47
     "@types/react-test-renderer": "^16.0.3",
43 48
     "react-native-typescript-transformer": "^1.2.11",
44
-    "tslib": "latest",
45 49
     "ts-jest": "^23.10.5",
46 50
     "tslint": "^5.12.1",
47 51
     "typescript": "^3.2.4"

+ 23
- 56
react-native-agora.podspec Datei anzeigen

@@ -9,52 +9,14 @@ require 'json'
9 9
 
10 10
 package = JSON.parse File.read File.join __dir__, "package.json"
11 11
 Pod::Spec.new do |s|
12
-
13
-  # ―――  Spec Metadata  ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
14
-  #
15
-  #  These will help people to find your library, and whilst it
16
-  #  can feel like a chore to fill in it's definitely to your advantage. The
17
-  #  summary should be tweet-length, and the description more in depth.
18
-  #
19
-
20 12
   s.name         = package["name"]
21 13
   s.version      = package["version"]
22 14
   s.summary      = package["summary"]
23
-
24
-  # This description is used to generate tags and improve search results.
25
-  #   * Think: What does it do? Why did you write it? What is the focus?
26
-  #   * Try to keep it short, snappy and to the point.
27
-  #   * Write the description between the DESC delimiters below.
28
-  #   * Finally, don't worry about the indent, CocoaPods strips it!
29
-  s.description  = <<-DESC
30
-                   DESC
15
+  s.description  = package["description"]
31 16
 
32 17
   s.homepage     = package["homepage"]
33
-  # s.screenshots  = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif"
34
-
35
-
36
-  # ―――  Spec License  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
37
-  #
38
-  #  Licensing your code is important. See http://choosealicense.com for more info.
39
-  #  CocoaPods will detect a license file if there is a named LICENSE*
40
-  #  Popular ones are 'MIT', 'BSD' and 'Apache License, Version 2.0'.
41
-  #
42
-
43 18
   s.license      = package["license"]
44
-  # s.license      = { :type => "MIT", :file => "FILE_LICENSE" }
45
-
46
-
47
-  # ――― Author Metadata  ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
48
-  #
49
-  #  Specify the authors of the library, with email addresses. Email addresses
50
-  #  of the authors are extracted from the SCM log. E.g. $ git log. CocoaPods also
51
-  #  accepts just a name if you'd rather not provide an email address.
52
-  #
53
-  #  Specify a social_media_url where others can refer to, for example a twitter
54
-  #  profile URL.
55
-  #
56
-
57
-  s.authors             = package["authors"]
19
+  s.authors      = package["authors"]
58 20
 
59 21
   # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
60 22
   #
@@ -62,7 +24,7 @@ Pod::Spec.new do |s|
62 24
   #  the deployment target. You can optionally include the target after the platform.
63 25
   #
64 26
 
65
-  # s.platform     = :ios
27
+  s.platform     = :ios
66 28
   # s.platform     = :ios, "5.0"
67 29
 
68 30
   #  When using multiple platforms
@@ -78,20 +40,11 @@ Pod::Spec.new do |s|
78 40
   #  Supports git, hg, bzr, svn and HTTP.
79 41
   #
80 42
 
81
-  s.source       = { :git => package["repository"]["url"], :tag => "#{s.version}" }
82
-
83
-
84
-  # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
85
-  #
86
-  #  CocoaPods is smart about how it includes source code. For source files
87
-  #  giving a folder will include any swift, h, m, mm, c & cpp files.
88
-  #  For header files it will include any header in the folder.
89
-  #  Not including the public_header_files will make all headers public.
90
-  #
91
-
92
-  s.source_files  = "Classes", "Classes/**/*.{h,m}"
93
-  s.exclude_files = "Classes/Exclude"
43
+  #s.source       = { :http => "file:///./ios" }
44
+  s.source        = { :git => package["repository"]["url"] }
45
+  #s.source        = { :git => package["repository"]["url"] , :tag => "#{s.version}" }
94 46
 
47
+  s.source_files  = "RCTAgora", "RCTAgora/**/*.{h,m}"
95 48
   # s.public_header_files = "Classes/**/*.h"
96 49
 
97 50
 
@@ -129,8 +82,22 @@ Pod::Spec.new do |s|
129 82
   #  you can include multiple dependencies to ensure it works.
130 83
 
131 84
   # s.requires_arc = true
132
-
133
-  # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
85
+  s.subspec 'AgoraRtcEngineKit' do |sp|
86
+    sp.dependency 'AgoraRtcEngine_iOS', '2.3.3'
87
+    sp.source_files = 'AgoraRtcEngineKit/**/*.{c,h,m,mm,S,cpp}'
88
+  end  
89
+
90
+  s.subspec 'AgoraRtcCryptoLoader' do |sp|
91
+    sp.source_files = './ios/RCTAgora/libs/AgoraRtcCryptoLoader.framework/**/*.{c,h,m,mm,S,cpp}'
92
+    sp.vendored_libraries = 'libcrypto.a'
93
+  end
94
+
95
+  s.xcconfig = {
96
+    "HEADER_SEARCH_PATHS" => [
97
+      "$(SDKROOT)../../node_modules/react-native/React",
98
+      "$(SDKROOT)../../ios/Pods"
99
+    ]
100
+  }
134 101
   s.dependency "AgoraRtcEngine_iOS", "2.3.3"
135 102
 
136 103
 end

+ 2
- 0
samples/simpleDemo/.gitignore Datei anzeigen

@@ -54,3 +54,5 @@ buck-out/
54 54
 
55 55
 # Bundle artifact
56 56
 *.jsbundle
57
+Pods
58
+**/*~

+ 23
- 0
samples/simpleDemo/ios/Podfile Datei anzeigen

@@ -0,0 +1,23 @@
1
+react_native_path = '../node_modules/react-native'
2
+project 'simpleDemo.xcodeproj'
3
+
4
+# Uncomment the next line to define a global platform for your project
5
+platform :ios, '9.0'
6
+
7
+target 'simpleDemo' do
8
+  # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
9
+  use_frameworks!
10
+
11
+  # Pods for simpleDemo
12
+  pod 'react-native-agora', path: '../node_modules/react-native-agora'
13
+  pod 'React', path: react_native_path
14
+  pod 'yoga', path: "#{react_native_path}/ReactCommon/yoga"
15
+  %w(DoubleConversion Folly glog).each do |lib_name|
16
+    pod lib_name, podspec: "#{react_native_path}/third-party-podspecs/#{lib_name}.podspec"
17
+  end
18
+  target 'simpleDemoTests' do
19
+    inherit! :search_paths
20
+    # Pods for testing
21
+  end
22
+
23
+end

+ 63
- 0
samples/simpleDemo/ios/Podfile.lock Datei anzeigen

@@ -0,0 +1,63 @@
1
+PODS:
2
+  - AgoraRtcEngine_iOS (2.3.3)
3
+  - boost-for-react-native (1.63.0)
4
+  - DoubleConversion (1.1.6)
5
+  - Folly (2016.10.31.00):
6
+    - boost-for-react-native
7
+    - DoubleConversion
8
+    - glog
9
+  - glog (0.3.5)
10
+  - React (0.57.8):
11
+    - React/Core (= 0.57.8)
12
+  - react-native-agora (2.3.3):
13
+    - AgoraRtcEngine_iOS (= 2.3.3)
14
+    - react-native-agora/AgoraRtcCryptoLoader (= 2.3.3)
15
+    - react-native-agora/AgoraRtcEngineKit (= 2.3.3)
16
+  - react-native-agora/AgoraRtcCryptoLoader (2.3.3):
17
+    - AgoraRtcEngine_iOS (= 2.3.3)
18
+  - react-native-agora/AgoraRtcEngineKit (2.3.3):
19
+    - AgoraRtcEngine_iOS (= 2.3.3)
20
+  - React/Core (0.57.8):
21
+    - yoga (= 0.57.8.React)
22
+  - yoga (0.57.8.React)
23
+
24
+DEPENDENCIES:
25
+  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
26
+  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
27
+  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
28
+  - React (from `../node_modules/react-native`)
29
+  - react-native-agora (from `../node_modules/react-native-agora`)
30
+  - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
31
+
32
+SPEC REPOS:
33
+  https://github.com/cocoapods/specs.git:
34
+    - AgoraRtcEngine_iOS
35
+    - boost-for-react-native
36
+
37
+EXTERNAL SOURCES:
38
+  DoubleConversion:
39
+    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
40
+  Folly:
41
+    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
42
+  glog:
43
+    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
44
+  React:
45
+    :path: "../node_modules/react-native"
46
+  react-native-agora:
47
+    :path: "../node_modules/react-native-agora"
48
+  yoga:
49
+    :path: "../node_modules/react-native/ReactCommon/yoga"
50
+
51
+SPEC CHECKSUMS:
52
+  AgoraRtcEngine_iOS: 8ad4b58dafed2cec5df03fa1f0ddbdad2c9ff958
53
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
54
+  DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
55
+  Folly: c89ac2d5c6ab169cd7397ef27485c44f35f742c7
56
+  glog: e8acf0ebbf99759d3ff18c86c292a5898282dcde
57
+  React: 1fe0eb13d90b625d94c3b117c274dcfd2e760e11
58
+  react-native-agora: 9a1e39cad840c86ad542fc3834824f9e031ae376
59
+  yoga: b1ce48b6cf950b98deae82838f5173ea7cf89e85
60
+
61
+PODFILE CHECKSUM: d5a5e2217f8f5a968a621c228e072b287bf5380b
62
+
63
+COCOAPODS: 1.5.3

+ 1
- 1
samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo-tvOS.xcscheme Datei anzeigen

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0940"
3
+   LastUpgradeVersion = "1010"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "NO"

+ 1
- 1
samples/simpleDemo/ios/simpleDemo.xcodeproj/xcshareddata/xcschemes/simpleDemo.xcscheme Datei anzeigen

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0940"
3
+   LastUpgradeVersion = "1010"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "NO"

+ 1
- 1
samples/simpleDemo/yarn.lock Datei anzeigen

@@ -4544,7 +4544,7 @@ react-is@^16.6.3:
4544 4544
   integrity sha1-wb0hxk8fE2TG9waV7ALWk5L0G/o=
4545 4545
 
4546 4546
 "react-native-agora@file:../..":
4547
-  version "1.2.5"
4547
+  version "2.3.3"
4548 4548
 
4549 4549
 react-native@0.57.8:
4550 4550
   version "0.57.8"

+ 6326
- 323
yarn.lock
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen