diff --git a/.idea/misc.xml b/.idea/misc.xml index 017d547..0765125 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index 35fca07..b387f45 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ archive this pretty soon because it'll be a lot of support. ## Usage -Use Koltin 1.3.50. +Use Koltin 1.3.70. Dependency config @@ -31,6 +31,16 @@ getFirebaseInstance() Then you can do Firestore things. + +## UPDATE + +To build the project you should the option `-x check` to build gradle command line. + +``` +./gradlew build -x check +``` + + ## Droidcon [See live example here](https://github.com/touchlab/DroidconKotlin/blob/master/sessionize/lib/src/commonMain/kotlin/co/touchlab/sessionize/SponsorModel.kt#L25) \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e24dda8..96a1094 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,22 +28,22 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation "androidx.constraintlayout:constraintlayout:1.1.3" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-beta01" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha01" implementation 'com.android.support:support-v4:28.0.0' implementation 'android.arch.lifecycle:extensions:1.1.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0' - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0-RC" + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'junit:junit:4.14' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'com.google.firebase:firebase-firestore:20.1.0' - implementation 'com.google.firebase:firebase-core:17.0.1' + implementation 'com.google.firebase:firebase-firestore:21.4.1' + implementation 'com.google.firebase:firebase-core:17.2.3' implementation project(':firestore') } diff --git a/build.gradle b/build.gradle index ce16fb8..81677d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.3.70' ext.versions = [ 'minSdk': 9, 'compileSdk': 28, - 'kotlin': '1.3.50', + 'kotlin': '1.3.70', 'androidPlugin': '3.4.1', 'androidTools': '29.0.1', @@ -17,14 +17,14 @@ buildscript { 'firebaseCoreAndroid': '17.0.1', 'firebaseFirestoreAndroid': '20.1.0', - 'stately': '0.9.3', - 'coroutines': '1.3.0' - + 'stately': '1.0.0-a2', + 'coroutines': '1.3.4' ] repositories { mavenLocal() maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + maven { url "https://kotlin.bintray.com/kotlinx" } google() jcenter() mavenCentral() @@ -32,7 +32,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:${versions.androidPlugin}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" - classpath 'com.google.gms:google-services:4.3.0' + classpath 'com.google.gms:google-services:4.3.3' classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.9.17' // NOTE: Do not place your application dependencies here; they belong @@ -44,6 +44,7 @@ allprojects { repositories { mavenLocal() maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + maven { url "https://kotlin.bintray.com/kotlinx" } google() jcenter() mavenCentral() diff --git a/buildlibrary.sh b/buildlibrary.sh index b777b05..55773d1 100755 --- a/buildlibrary.sh +++ b/buildlibrary.sh @@ -1,7 +1,7 @@ set -ev -PODS_ROOT=/Users/kgalligan/devel_kmp/FirestoreKMP/iosApp/Pods +PODS_ROOT=/Users/magnumrocha/personal/FirestoreKMP/iosApp/Pods ./gradlew :firestore:build \ -Pkotlin.native.cocoapods.target=ios_x64 \ --Pkotlin.native.cocoapods.paths.headers="/Users/kgalligan/devel_kmp/FirestoreKMP/iosApp/Pods/Headers/Public" \ --Pkotlin.native.cocoapods.paths.frameworks="/Users/kgalligan/devel_kmp/FirestoreKMP/iosApp/Pods/FirebaseCore /Users/kgalligan/devel_kmp/FirestoreKMP/iosApp/Pods/FirebaseFirestore" +-Pkotlin.native.cocoapods.paths.headers="/Users/magnumrocha/personal/FirestoreKMP/iosApp/Pods/Headers/Public" \ +-Pkotlin.native.cocoapods.paths.frameworks="/Users/magnumrocha/personal/FirestoreKMP/iosApp/Pods/FirebaseCore /Users/magnumrocha/personal/FirestoreKMP/iosApp/Pods/FirebaseFirestore" diff --git a/firebase-test/build.gradle b/firebase-test/build.gradle index 5d5de6e..9c256d3 100644 --- a/firebase-test/build.gradle +++ b/firebase-test/build.gradle @@ -35,9 +35,10 @@ kotlin { // android("android") // This is for iPhone emulator // Switch here to iosArm64 (or iosArm32) to build library for iPhone device - iosX64("ios"){ - binaries.getFramework("DEBUG") - .freeCompilerArgs.add("-tr") + iosX64("ios") { + compilations.main { + it.kotlinOptions.freeCompilerArgs += ["-tr"] + } } sourceSets { commonMain { @@ -46,8 +47,8 @@ kotlin { implementation project(":firestore") implementation kotlin('test-common') implementation kotlin('test-annotations-common') - implementation "co.touchlab:stately:${versions.stately}" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.0-RC" + implementation "co.touchlab:stately-common:${versions.stately}" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4" } } commonTest { @@ -69,7 +70,7 @@ kotlin { }*/ iosMain { dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.0-RC" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.4" } } iosTest { diff --git a/firebase-test/iosApp/Podfile.lock b/firebase-test/iosApp/Podfile.lock index ab96670..d524b50 100644 --- a/firebase-test/iosApp/Podfile.lock +++ b/firebase-test/iosApp/Podfile.lock @@ -6,8 +6,8 @@ PODS: - BoringSSL-GRPC/Interface (= 0.0.3) - BoringSSL-GRPC/Interface (0.0.3) - firebase_test (0.2.0) - - FirebaseAuthInterop (1.0.0) - - FirebaseCore (6.0.2): + - FirebaseAuthInterop (1.1.0) + - FirebaseCore (6.0.4): - GoogleUtilities/Environment (~> 6.0) - GoogleUtilities/Logger (~> 6.0) - FirebaseFirestore (1.3.2): @@ -25,8 +25,8 @@ PODS: - leveldb-library (~> 1.20) - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - GoogleUtilities/Environment (6.2.0) - - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment (6.5.1) + - GoogleUtilities/Logger (6.5.1): - GoogleUtilities/Environment - "gRPC-C++ (0.0.9)": - "gRPC-C++/Implementation (= 0.0.9)" @@ -44,13 +44,13 @@ PODS: - gRPC-Core/Interface (= 1.21.0) - nanopb (~> 0.3) - gRPC-Core/Interface (1.21.0) - - leveldb-library (1.20) - - nanopb (0.3.901): - - nanopb/decode (= 0.3.901) - - nanopb/encode (= 0.3.901) - - nanopb/decode (0.3.901) - - nanopb/encode (0.3.901) - - Protobuf (3.8.0) + - leveldb-library (1.22) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) + - Protobuf (3.11.4) DEPENDENCIES: - firebase_test (from `..`) @@ -58,7 +58,7 @@ DEPENDENCIES: - FirebaseFirestore (~> 1.3.2) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - BoringSSL-GRPC - FirebaseAuthInterop - FirebaseCore @@ -77,16 +77,16 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 firebase_test: f8da50830c6d9f009624a8de20fed39fb0bbec31 - FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 + FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9 + FirebaseCore: 7ea99e200f0024262650be56623fbe6a7bef1707 FirebaseFirestore: d9c55dfd0cd648f420cc8340c4940dc3eab2d860 - GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275 "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 - leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 - nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 - Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 + leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd + Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 PODFILE CHECKSUM: f49e7a806dd2d1115c527217708f78cbaa1b3851 -COCOAPODS: 1.6.1 +COCOAPODS: 1.9.0 diff --git a/firebase-test/iosApp/iosApp.xcodeproj/project.pbxproj b/firebase-test/iosApp/iosApp.xcodeproj/project.pbxproj index d9480f3..f7bfac4 100644 --- a/firebase-test/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/firebase-test/iosApp/iosApp.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -222,28 +222,11 @@ files = ( ); inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -448,6 +431,7 @@ CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -469,6 +453,7 @@ CODE_SIGN_STYLE = Automatic; ENABLE_BITCODE = NO; INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/firebase-test/iosApp/iosApp/ViewController.swift b/firebase-test/iosApp/iosApp/ViewController.swift index ce32cd6..1162039 100644 --- a/firebase-test/iosApp/iosApp/ViewController.swift +++ b/firebase-test/iosApp/iosApp/ViewController.swift @@ -4,7 +4,7 @@ import firebase_test class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - SampleIosKt.kickOffTest() + ConfigTestFirestoreKt.configTestFirestore() // label.text = Proxy().proxyHello() } diff --git a/firebaseTestIos/Podfile.lock b/firebaseTestIos/Podfile.lock index 21e3f8e..4fe1547 100644 --- a/firebaseTestIos/Podfile.lock +++ b/firebaseTestIos/Podfile.lock @@ -58,7 +58,7 @@ DEPENDENCIES: - FirebaseFirestore (~> 1.3.2) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - BoringSSL-GRPC - FirebaseAuthInterop - FirebaseCore @@ -89,4 +89,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 6fd71b69807c8c057af8a2a1610b2a96cf6bf018 -COCOAPODS: 1.6.1 +COCOAPODS: 1.9.0 diff --git a/firebaseTestIos/firebaseTestIos.xcodeproj/project.pbxproj b/firebaseTestIos/firebaseTestIos.xcodeproj/project.pbxproj index 8d4d19e..3a87db8 100644 --- a/firebaseTestIos/firebaseTestIos.xcodeproj/project.pbxproj +++ b/firebaseTestIos/firebaseTestIos.xcodeproj/project.pbxproj @@ -229,28 +229,11 @@ files = ( ); inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-firebaseTestIos/Pods-firebaseTestIos-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-firebaseTestIos/Pods-firebaseTestIos-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-firebaseTestIos/Pods-firebaseTestIos-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/firebaseTestIos/firebaseTestIos/AppDelegate.swift b/firebaseTestIos/firebaseTestIos/AppDelegate.swift index f9756ff..33155b5 100644 --- a/firebaseTestIos/firebaseTestIos/AppDelegate.swift +++ b/firebaseTestIos/firebaseTestIos/AppDelegate.swift @@ -18,9 +18,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - FirebaseApp.configure() - Firestore.initialize() - SampleIosKt.kickOffTest() + //FirebaseApp.configure() + //Firestore.initialize() + ConfigTestFirestoreKt.configTestFirestore() // Override point for customization after application launch. return true } diff --git a/firestore/build.gradle b/firestore/build.gradle index 1d3d69e..89f6776 100644 --- a/firestore/build.gradle +++ b/firestore/build.gradle @@ -31,8 +31,8 @@ version = VERSION_NAME dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' - testImplementation 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' } dokka { @@ -87,7 +87,8 @@ kotlin { commonMain { dependencies { implementation kotlin('stdlib-common') - implementation "co.touchlab:stately:${versions.stately}" + implementation "co.touchlab:stately-common:${versions.stately}" + implementation "co.touchlab:stately-concurrency:${versions.stately}" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${versions.coroutines}" } } @@ -103,7 +104,7 @@ kotlin { dependsOn commonMain dependencies { implementation kotlin('stdlib') - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}" implementation "com.google.firebase:firebase-firestore:${versions.firebaseFirestoreAndroid}" implementation "com.google.firebase:firebase-core:${versions.firebaseCoreAndroid}" } @@ -114,7 +115,7 @@ kotlin { dependencies { implementation kotlin("test") implementation kotlin("test-junit") - implementation 'junit:junit:4.12' + implementation 'junit:junit:4.13' implementation "androidx.test:core:1.2.0" implementation "androidx.test.ext:junit:1.1.1" } diff --git a/firestore/src/iosMain/kotlin/co/touchlab/firebase/firestore/Timestamp.kt b/firestore/src/iosMain/kotlin/co/touchlab/firebase/firestore/Timestamp.kt index a61b685..7536cad 100644 --- a/firestore/src/iosMain/kotlin/co/touchlab/firebase/firestore/Timestamp.kt +++ b/firestore/src/iosMain/kotlin/co/touchlab/firebase/firestore/Timestamp.kt @@ -7,7 +7,7 @@ actual typealias Timestamp = FIRTimestamp actual fun timestampNow(): Timestamp = FIRTimestamp.timestamp() actual val Timestamp.seconds: Long - get() = getSeconds() + get() = seconds() actual val Timestamp.nanoseconds: Int - get() = getNanoseconds() \ No newline at end of file + get() = nanoseconds() \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f7460b8..c1f9960 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +w \ No newline at end of file diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock index 29f2767..6d4c6fa 100644 --- a/iosApp/Podfile.lock +++ b/iosApp/Podfile.lock @@ -5,8 +5,8 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.3): - BoringSSL-GRPC/Interface (= 0.0.3) - BoringSSL-GRPC/Interface (0.0.3) - - FirebaseAuthInterop (1.0.0) - - FirebaseCore (6.0.2): + - FirebaseAuthInterop (1.1.0) + - FirebaseCore (6.0.4): - GoogleUtilities/Environment (~> 6.0) - GoogleUtilities/Logger (~> 6.0) - FirebaseFirestore (1.3.2): @@ -27,8 +27,8 @@ PODS: - firestore (1.0): - FirebaseCore (~> 6.0.2) - FirebaseFirestore (~> 1.3.2) - - GoogleUtilities/Environment (6.2.0) - - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment (6.5.1) + - GoogleUtilities/Logger (6.5.1): - GoogleUtilities/Environment - "gRPC-C++ (0.0.9)": - "gRPC-C++/Implementation (= 0.0.9)" @@ -46,19 +46,19 @@ PODS: - gRPC-Core/Interface (= 1.21.0) - nanopb (~> 0.3) - gRPC-Core/Interface (1.21.0) - - leveldb-library (1.20) - - nanopb (0.3.901): - - nanopb/decode (= 0.3.901) - - nanopb/encode (= 0.3.901) - - nanopb/decode (0.3.901) - - nanopb/encode (0.3.901) - - Protobuf (3.8.0) + - leveldb-library (1.22) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) + - Protobuf (3.11.4) DEPENDENCIES: - firestore (from `../firestore`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - BoringSSL-GRPC - FirebaseAuthInterop - FirebaseCore @@ -76,17 +76,17 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 - FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 + FirebaseAuthInterop: a0f37ae05833af156e72028f648d313f7e7592e9 + FirebaseCore: 7ea99e200f0024262650be56623fbe6a7bef1707 FirebaseFirestore: d9c55dfd0cd648f420cc8340c4940dc3eab2d860 firestore: 0de4c388616964a47300d84b64aca4eee3e43485 - GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GoogleUtilities: 06eb53bb579efe7099152735900dd04bf09e7275 "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 - leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 - nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 - Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 + leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd + Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 PODFILE CHECKSUM: 982832c904e248a3808b4d4ef3ed1dafcd77c5fc -COCOAPODS: 1.6.1 +COCOAPODS: 1.9.0 diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index df3de25..0f61989 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -189,28 +189,11 @@ files = ( ); inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework", - "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework", - "${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework", - "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", - "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh;