[REGRESSION] Re-enable Jitsi Chat (#2687)
* Fix main jitsi * Fix iOS * Clear build.gradle cache * Don't restore gradle * cache is back * Use master * Point to react-native-jitsi-meet#master
This commit is contained in:
parent
999883e4d6
commit
c9c8bdecd0
|
@ -17,7 +17,7 @@ buildscript {
|
||||||
supportLibVersion = "28.0.0"
|
supportLibVersion = "28.0.0"
|
||||||
libre_build = !(isPlay.toBoolean())
|
libre_build = !(isPlay.toBoolean())
|
||||||
jitsi_url = isPlay ? "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases" : "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases"
|
jitsi_url = isPlay ? "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases" : "https://github.com/RocketChat/jitsi-maven-repository/raw/libre/releases"
|
||||||
jitsi_version = isPlay ? "2.10.2-rc" : "2.10.0-libre"
|
jitsi_version = isPlay ? "2.10.2" : "2.10.0-libre"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -51,13 +51,13 @@ allprojects {
|
||||||
// Android JSC is installed from npm
|
// Android JSC is installed from npm
|
||||||
url("$rootDir/../node_modules/jsc-android/dist")
|
url("$rootDir/../node_modules/jsc-android/dist")
|
||||||
}
|
}
|
||||||
|
|
||||||
maven {
|
maven {
|
||||||
url safeExtGet("jitsi_url", "https://github.com/RocketChat/jitsi-maven-repository/raw/master/releases")
|
url jitsi_url
|
||||||
}
|
}
|
||||||
|
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
|
|
||||||
maven { url 'https://maven.google.com' }
|
maven { url 'https://maven.google.com' }
|
||||||
maven { url 'https://www.jitpack.io' }
|
maven { url 'https://www.jitpack.io' }
|
||||||
}
|
}
|
||||||
|
|
|
@ -877,7 +877,7 @@ EXTERNAL SOURCES:
|
||||||
|
|
||||||
CHECKOUT OPTIONS:
|
CHECKOUT OPTIONS:
|
||||||
JitsiMeetSDK:
|
JitsiMeetSDK:
|
||||||
:commit: 93bc9c44d1c6d48ebd1e298dd5391db0d5d3a948
|
:commit: 34660a3a34798fe28fcfd340f9ad30184b9fa0d1
|
||||||
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
|
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// Generated by Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
|
// Generated by Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
|
||||||
#ifndef JITSIMEET_SWIFT_H
|
#ifndef JITSIMEET_SWIFT_H
|
||||||
#define JITSIMEET_SWIFT_H
|
#define JITSIMEET_SWIFT_H
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
// swift-interface-format-version: 1.0
|
// swift-interface-format-version: 1.0
|
||||||
// swift-compiler-version: Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
|
// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
|
||||||
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
||||||
import AVKit
|
import AVKit
|
||||||
import CallKit
|
import CallKit
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
// swift-interface-format-version: 1.0
|
// swift-interface-format-version: 1.0
|
||||||
// swift-compiler-version: Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
|
// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
|
||||||
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
// swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
||||||
import AVKit
|
import AVKit
|
||||||
import CallKit
|
import CallKit
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
// swift-interface-format-version: 1.0
|
// swift-interface-format-version: 1.0
|
||||||
// swift-compiler-version: Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
|
// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
|
||||||
// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
||||||
import AVKit
|
import AVKit
|
||||||
import CallKit
|
import CallKit
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
// swift-interface-format-version: 1.0
|
// swift-interface-format-version: 1.0
|
||||||
// swift-compiler-version: Apple Swift version 5.3 (swiftlang-1200.0.29.2 clang-1200.0.30.1)
|
// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
|
||||||
// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
// swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name JitsiMeet
|
||||||
import AVKit
|
import AVKit
|
||||||
import CallKit
|
import CallKit
|
||||||
|
|
Binary file not shown.
File diff suppressed because one or more lines are too long
|
@ -877,7 +877,7 @@ EXTERNAL SOURCES:
|
||||||
|
|
||||||
CHECKOUT OPTIONS:
|
CHECKOUT OPTIONS:
|
||||||
JitsiMeetSDK:
|
JitsiMeetSDK:
|
||||||
:commit: 93bc9c44d1c6d48ebd1e298dd5391db0d5d3a948
|
:commit: 34660a3a34798fe28fcfd340f9ad30184b9fa0d1
|
||||||
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
|
:git: https://github.com/RocketChat/jitsi-meet-ios-sdk-releases.git
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
|
|
|
@ -12931,7 +12931,7 @@ react-native-iphone-x-helper@^1.0.3, react-native-iphone-x-helper@^1.2.1:
|
||||||
|
|
||||||
react-native-jitsi-meet@RocketChat/react-native-jitsi-meet:
|
react-native-jitsi-meet@RocketChat/react-native-jitsi-meet:
|
||||||
version "2.4.0"
|
version "2.4.0"
|
||||||
resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/736ac57044c0723185fcc9e2b768a1ee53be7e13"
|
resolved "https://codeload.github.com/RocketChat/react-native-jitsi-meet/tar.gz/e45a042bc916d53c05d1d4e09becb2186144bc72"
|
||||||
|
|
||||||
react-native-keycommands@2.0.3:
|
react-native-keycommands@2.0.3:
|
||||||
version "2.0.3"
|
version "2.0.3"
|
||||||
|
|
Loading…
Reference in New Issue