Update config

Author: kpgalligan

samples/sample-bugsnag/shared/build.gradle.kts

@@ -27,8 +27,6 @@ android {
     }
 }
 
-val CRASHKIOS_VERSION: String by project
-
 version = "0.0.1"
 
 kotlin {

samples/sample-crashlytics/app/build.gradle.kts

@@ -48,8 +48,6 @@ android {
     }
 }
 
-val CRASHKIOS_VERSION: String by project
-
 dependencies {
     implementation(project(":shared"))
     implementation(libs.bundles.android)
@@ -58,5 +56,5 @@ dependencies {
     implementation (platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
-    implementation("co.touchlab.crashkios:crashlytics:${CRASHKIOS_VERSION}")
+    implementation("co.touchlab.crashkios:crashlytics")
 }

samples/sample-crashlytics/build.gradle.kts

@@ -9,30 +9,22 @@
  */
 buildscript {
     repositories {
-        google()
-        mavenLocal()
         mavenCentral()
-        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
-    }
-    extra.apply {
-        val parentCrashKiOS = java.util.Properties().apply { load(java.io.StringReader(File("${projectDir.path}/../../gradle.properties").readText())) }.get("VERSION_NAME") as String
-        set("CRASHKIOS_VERSION", parentCrashKiOS)
+        google()
     }
     dependencies {
         fun readParentKotlin():String = java.util.Properties().apply { load(java.io.StringReader(File("${projectDir.path}/../../gradle.properties").readText())) }.get("KOTLIN_VERSION") as String
 
-        classpath("com.android.tools.build:gradle:7.0.1")
+        classpath("com.android.tools.build:gradle:7.2.2")
         classpath(kotlin("gradle-plugin", readParentKotlin()))
-        classpath("com.google.gms:google-services:4.3.10")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
+        classpath("com.google.gms:google-services:4.3.14")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
         classpath("co.touchlab.crashkios:utils:0.7.1-alpha3")
     }
 }
 allprojects{
     repositories{
-        mavenLocal()
         mavenCentral()
-        maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
         google()
     }
 }

samples/sample-crashlytics/gradle/wrapper/gradle-wrapper.properties

@@ -10,6 +10,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/sample-crashlytics/ios/Podfile.lock

@@ -73,7 +73,7 @@ SPEC CHECKSUMS:
   GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
-  shared: 067de882ce4dab80548f9227a9f4bf54b7c9afe7
+  shared: 0ac2a6917fe3052eafc341e7f80edcaabf06253c
 
 PODFILE CHECKSUM: 0ff799ecfce730b0f52c42ff7c611152c6705e26
 

samples/sample-crashlytics/settings.gradle.kts

@@ -11,3 +11,10 @@
 include(":app", ":shared")
 
 enableFeaturePreview("VERSION_CATALOGS")
+
+includeBuild("../..") {
+    dependencySubstitution {
+        substitute(module("co.touchlab.crashkios:crashlytics"))
+            .using(project(":crashlytics")).because("we want to auto-wire up sample dependency")
+    }
+}

samples/sample-crashlytics/shared/build.gradle.kts

@@ -7,12 +7,11 @@
  *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
-import co.touchlab.faktory.crashlyticsLinkerConfig
-
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
     kotlin("native.cocoapods")
+    id("co.touchlab.crashkios.crashlyticslink") version ("0.8.0")
 }
 
 android {
@@ -27,8 +26,6 @@ android {
     }
 }
 
-val CRASHKIOS_VERSION: String by project
-
 version = "0.1.2"
 
 kotlin {
@@ -41,7 +38,7 @@ kotlin {
         val commonMain by sourceSets.getting {
             dependencies {
                 implementation(kotlin("stdlib-common"))
-                api("co.touchlab.crashkios:crashlytics:${CRASHKIOS_VERSION}")
+                api("co.touchlab.crashkios:crashlytics")
             }
         }
 
@@ -71,10 +68,7 @@ kotlin {
         homepage = "https://www.touchlab.co"
         ios.deploymentTarget = "13.5"
         framework {
-//            export("co.touchlab.crashkios:crashlytics:${CRASHKIOS_VERSION}")
             isStatic = false
         }
     }
-
-    crashlyticsLinkerConfig()
 }

samples/sample-crashlytics/shared/shared.podspec

@@ -22,8 +22,8 @@ Pod::Spec.new do |spec|
             :execution_position => :before_compile,
             :shell_path => '/bin/sh',
             :script => <<-SCRIPT
-                if [ "YES" = "$COCOAPODS_SKIP_KOTLIN_BUILD" ]; then
-                  echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\""
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
                   exit 0
                 fi
                 set -ev