Update pods, change gradle settings

2025-12-05 23:19:10 +00:00 · 2021-02-27 10:55:55 +01:00
parent 31ffc9fb2a
commit ffda80829f
6 changed files with 79 additions and 68 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,11 +2,10 @@

 buildscript {
    repositories {
-        google()
+        gradlePluginPortal()
        jcenter()
-        maven {
-            url = uri("https://plugins.gradle.org/m2/")
-        }
+        google()
+        mavenCentral()
    }
    dependencies {
        classpath(Config.Plugin.android)
@@ -27,6 +26,7 @@ allprojects {
    repositories {
        google()
        jcenter()
+        mavenCentral()
        maven {
            url = uri("https://jitpack.io")
        }
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -18,9 +18,9 @@

 object Dependencies {
    object Kotlin {
-        const val version = "1.4.30"
+        const val version = "1.4.31"
        const val core = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${version}"
-        const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
+        const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0"
        const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2-native-mt"
        const val coroutinesAndroid =
            "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2-native-mt"
@@ -56,7 +56,7 @@ object Dependencies {
    }

    object Ktor {
-        private const val version = "1.5.1"
+        private const val version = "1.5.2"
        const val ktorCore = "io.ktor:ktor-client-core:$version"
        const val ktorOkhttp = "io.ktor:ktor-client-okhttp:$version"
        const val ktorIos = "io.ktor:ktor-client-ios:$version"
--- a/ios/circolapp/Podfile.lock
+++ b/ios/circolapp/Podfile.lock
@@ -1,64 +1,64 @@
 PODS:
  - AppStorage (1.0.3)
  - Carte (2.2.1)
-  - Firebase/CoreOnly (7.3.0):
-    - FirebaseCore (= 7.3.0)
-  - Firebase/Messaging (7.3.0):
+  - Firebase/CoreOnly (7.7.0):
+    - FirebaseCore (= 7.7.0)
+  - Firebase/Messaging (7.7.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 7.3.0)
-  - FirebaseCore (7.3.0):
-    - FirebaseCoreDiagnostics (~> 7.0)
+    - FirebaseMessaging (~> 7.7.0)
+  - FirebaseCore (7.7.0):
+    - FirebaseCoreDiagnostics (~> 7.4)
    - GoogleUtilities/Environment (~> 7.0)
    - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.3.0):
+  - FirebaseCoreDiagnostics (7.7.0):
    - GoogleDataTransport (~> 8.0)
    - GoogleUtilities/Environment (~> 7.0)
    - GoogleUtilities/Logger (~> 7.0)
-    - nanopb (~> 2.30906.0)
-  - FirebaseInstallations (7.3.0):
+    - nanopb (~> 2.30907.0)
+  - FirebaseInstallations (7.7.0):
    - FirebaseCore (~> 7.0)
    - GoogleUtilities/Environment (~> 7.0)
    - GoogleUtilities/UserDefaults (~> 7.0)
    - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (7.3.0):
+  - FirebaseInstanceID (7.7.0):
    - FirebaseCore (~> 7.0)
    - FirebaseInstallations (~> 7.0)
    - GoogleUtilities/Environment (~> 7.0)
    - GoogleUtilities/UserDefaults (~> 7.0)
-  - FirebaseMessaging (7.3.0):
+  - FirebaseMessaging (7.7.0):
    - FirebaseCore (~> 7.0)
    - FirebaseInstanceID (~> 7.0)
    - GoogleUtilities/AppDelegateSwizzler (~> 7.0)
    - GoogleUtilities/Environment (~> 7.0)
    - GoogleUtilities/Reachability (~> 7.0)
    - GoogleUtilities/UserDefaults (~> 7.0)
-  - GoogleDataTransport (8.1.0):
-    - nanopb (~> 2.30906.0)
-  - GoogleUtilities/AppDelegateSwizzler (7.1.1):
+  - GoogleDataTransport (8.2.0):
+    - nanopb (~> 2.30907.0)
+  - GoogleUtilities/AppDelegateSwizzler (7.2.2):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.1.1):
+  - GoogleUtilities/Environment (7.2.2):
    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.1.1):
+  - GoogleUtilities/Logger (7.2.2):
    - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.1.1):
+  - GoogleUtilities/Network (7.2.2):
    - GoogleUtilities/Logger
    - "GoogleUtilities/NSData+zlib"
    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.1.1)"
-  - GoogleUtilities/Reachability (7.1.1):
+  - "GoogleUtilities/NSData+zlib (7.2.2)"
+  - GoogleUtilities/Reachability (7.2.2):
    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.1.1):
+  - GoogleUtilities/UserDefaults (7.2.2):
    - GoogleUtilities/Logger
  - HTMLKit (3.1.0)
  - Introspect (0.1.2)
-  - nanopb (2.30906.0):
-    - nanopb/decode (= 2.30906.0)
-    - nanopb/encode (= 2.30906.0)
-  - nanopb/decode (2.30906.0)
-  - nanopb/encode (2.30906.0)
-  - PromisesObjC (1.2.11)
+  - nanopb (2.30907.0):
+    - nanopb/decode (= 2.30907.0)
+    - nanopb/encode (= 2.30907.0)
+  - nanopb/decode (2.30907.0)
+  - nanopb/encode (2.30907.0)
+  - PromisesObjC (1.2.12)
  - shared (1.0):
    - HTMLKit (~> 3.1.0)
  - SwiftUIRefresh (0.0.3):
@@ -96,21 +96,21 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  AppStorage: dc9e2c18b5ebb7fed666af00c103b1c1432d459b
  Carte: 6bcff4eaa894ff5b979d646de833fec96e04a38c
-  Firebase: 26223c695fe322633274198cb19dca8cb7e54416
-  FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
-  FirebaseCoreDiagnostics: d50e11039e5984d92c8a512be2395f13df747350
-  FirebaseInstallations: 971df89b48ae5ee4cc2bf6935f3857a525d28550
-  FirebaseInstanceID: 5ccdee6a84e6b4bb5316de0a8cd88bc749ba490d
-  FirebaseMessaging: 68d1bcb14880189558a8ae57167abe0b7e417232
-  GoogleDataTransport: 116c84c4bdeb76be2a7a46de51244368f9794eab
-  GoogleUtilities: 3dc4ff0d5e4840e2fa8eef0889620e8c33d4218c
+  Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5
+  FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b
+  FirebaseCoreDiagnostics: 179bf3831213451c8addd036aca7fcf5492ec154
+  FirebaseInstallations: 42c86e7b02ff75b7f27f85833bf5dcb5f38a9774
+  FirebaseInstanceID: cf940324a20ac14a27ad1e931d15ac9d335526db
+  FirebaseMessaging: ce33c2537fdda1d1a4bc82b2245e3c3bf9107684
+  GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
+  GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43
  HTMLKit: 4ed10a911462cbf972329ec6aaaa827208dfd70c
  Introspect: 85a29d2c5ee4d3d15469ad0b75fd8839f3e72674
-  nanopb: 1bf24dd71191072e120b83dd02d08f3da0d65e53
-  PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
-  shared: fb3154b4def038b2b13aa88e01dd9f91bb2de9b5
+  nanopb: 59221d7f958fb711001e6a449489542d92ae113e
+  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
+  shared: 9209fbc2ccc5adc7e2a810bb3f51e25f28e9cc58
  SwiftUIRefresh: ca6ae2718d25aad5dd68bbf5d2ae36ef6ade98bf

 PODFILE CHECKSUM: faad88d7c92ca3deaa3ebc5d53f6ff86592a6113

-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1
--- a/ios/circolapp/circolapp.xcodeproj/project.pbxproj
+++ b/ios/circolapp/circolapp.xcodeproj/project.pbxproj
@@ -554,6 +554,15 @@
 				DEVELOPMENT_TEAM = 778438K57Y;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"COCOAPODS=1",
+					"$(inherited)",
+					"PB_FIELD_32BIT=1",
+					"PB_NO_PACKED_STRUCTS=1",
+					"PB_ENABLE_MALLOC=1",
+					FIREBASE_ANALYTICS_SUPPRESS_WARNING,
+				);
 				INFOPLIST_FILE = circolapp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -588,6 +597,15 @@
 				DEVELOPMENT_TEAM = 778438K57Y;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"COCOAPODS=1",
+					"$(inherited)",
+					"PB_FIELD_32BIT=1",
+					"PB_NO_PACKED_STRUCTS=1",
+					"PB_ENABLE_MALLOC=1",
+					FIREBASE_ANALYTICS_SUPPRESS_WARNING,
+				);
 				INFOPLIST_FILE = circolapp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,14 @@
+pluginManagement {
+    repositories {
+        google()
+        jcenter()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+
+}
+rootProject.name = "Circolapp"
+
 include(":backend")
 include(":shared")
-include(":app")
-rootProject.name = "Circolapp"
+include(":app")
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -10,27 +10,10 @@ plugins {

 version = "1.0"

-repositories {
-    gradlePluginPortal()
-    google()
-    jcenter()
-    mavenCentral()
-    maven {
-        url = uri("https://dl.bintray.com/kotlin/kotlin-eap")
-    }
-}
-
 kotlin {
    android()
    jvm()
-
-    val sdkName = System.getenv("SDK_NAME") ?: "iphonesimulator"
-
-    if (sdkName.startsWith("iphoneos")) {
-        iosArm64("ios")
-    } else {
-        iosX64("ios")
-    }
+    ios ()

    cocoapods {
        summary = "Shared module for Circolapp"
@@ -127,9 +110,9 @@ sqldelight {
 val packForXcode by tasks.creating(Sync::class) {
    group = "build"
    val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
-    val targetName = "ios"
-    val framework =
-        kotlin.targets.getByName<KotlinNativeTarget>(targetName).binaries.getFramework(mode)
+    val sdkName = System.getenv("SDK_NAME") ?: "iphonesimulator"
+    val targetName = "ios" + if (sdkName.startsWith("iphoneos")) "Arm64" else "X64"
+    val framework = kotlin.targets.getByName<KotlinNativeTarget>(targetName).binaries.getFramework(mode)
    inputs.property("mode", mode)
    dependsOn(framework.linkTask)
    val targetDir = File(buildDir, "xcode-frameworks")