Skip to content

Commit

Permalink
migration fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiebe committed Jan 30, 2024
1 parent c35a441 commit 23abcae
Show file tree
Hide file tree
Showing 25 changed files with 385 additions and 10,368 deletions.
13 changes: 1 addition & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@Suppress("DSL_SCOPE_VIOLATION")
plugins {
//alias(libs.plugins.complete.kotlin)
alias(libs.plugins.complete.kotlin)
}

buildscript {
Expand All @@ -19,22 +19,11 @@ buildscript {
classpath(libs.kotlin.serialization)
classpath(libs.moko.gradle)
classpath(libs.buildkonfig.gradle)
/* classpath(libs.firebase.gradle)
classpath(libs.firebase.crashlyticsgradle)
classpath(libs.firebase.performancegradle)*/
}
}

allprojects {
repositories {
maven {
url = uri("https://maven.pkg.github.com/Tiebe/MagisterAPIKt")
credentials {
username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
}
}

google()
mavenCentral()
mavenLocal()
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Gradle
org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M"
org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M -Xexpect-actual-classes"

kotlin.code.style=official
android.useAndroidX=true
Expand Down
3 changes: 0 additions & 3 deletions iosApp/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ platform :ios, '11.0'
target 'iosApp' do
use_frameworks!
pod 'shared', :path => '../shared'
pod 'Google-Mobile-Ads-SDK'
pod 'FirebaseAnalytics'
pod 'FirebaseCrashlytics'
end

post_install do |installer|
Expand Down
140 changes: 1 addition & 139 deletions iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,154 +1,16 @@
PODS:
- FirebaseAnalytics (10.8.0):
- FirebaseAnalytics/AdIdSupport (= 10.8.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- GoogleUtilities/Network (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseAnalytics/AdIdSupport (10.8.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleAppMeasurement (= 10.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- GoogleUtilities/Network (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseCore (10.9.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/Logger (~> 7.8)
- FirebaseCoreExtension (10.10.0):
- FirebaseCore (~> 10.0)
- FirebaseCoreInternal (10.9.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseCrashlytics (10.10.0):
- FirebaseCore (~> 10.5)
- FirebaseInstallations (~> 10.0)
- FirebaseSessions (~> 10.5)
- GoogleDataTransport (~> 9.2)
- GoogleUtilities/Environment (~> 7.8)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (~> 2.1)
- FirebaseInstallations (10.9.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- FirebaseSessions (10.10.0):
- FirebaseCore (~> 10.5)
- FirebaseCoreExtension (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleDataTransport (~> 9.2)
- GoogleUtilities/Environment (~> 7.10)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesSwift (~> 2.1)
- Google-Mobile-Ads-SDK (10.3.0):
- GoogleAppMeasurement (< 11.0, >= 7.0)
- GoogleUserMessagingPlatform (>= 1.1)
- GoogleAppMeasurement (10.8.0):
- GoogleAppMeasurement/AdIdSupport (= 10.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- GoogleUtilities/Network (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.8.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.8.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- GoogleUtilities/Network (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.8.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
- GoogleUtilities/MethodSwizzler (~> 7.8)
- GoogleUtilities/Network (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleDataTransport (9.2.3):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUserMessagingPlatform (2.0.1)
- GoogleUtilities/AppDelegateSwizzler (7.11.1):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.11.1):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.11.1):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.11.1):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.11.1):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.11.1)"
- GoogleUtilities/Reachability (7.11.1):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.11.1):
- GoogleUtilities/Logger
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
- nanopb/encode (= 2.30909.0)
- nanopb/decode (2.30909.0)
- nanopb/encode (2.30909.0)
- PromisesObjC (2.2.0)
- PromisesSwift (2.2.0):
- PromisesObjC (= 2.2.0)
- shared (3.4.0)

DEPENDENCIES:
- FirebaseAnalytics
- FirebaseCrashlytics
- Google-Mobile-Ads-SDK
- shared (from `../shared`)

SPEC REPOS:
trunk:
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreExtension
- FirebaseCoreInternal
- FirebaseCrashlytics
- FirebaseInstallations
- FirebaseSessions
- Google-Mobile-Ads-SDK
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleUserMessagingPlatform
- GoogleUtilities
- nanopb
- PromisesObjC
- PromisesSwift

EXTERNAL SOURCES:
shared:
:path: "../shared"

SPEC CHECKSUMS:
FirebaseAnalytics: e1fc758bd5d71823bba970c076abee4b2450a5f4
FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557
FirebaseCoreExtension: 8d93ebbf6838a874b4ed82a564c9d6705f8365dd
FirebaseCoreInternal: d2b4acb827908e72eca47a9fd896767c3053921e
FirebaseCrashlytics: bc8f3bed7f4d04be79d87391455efb4c9b163131
FirebaseInstallations: c58489c9caacdbf27d1da60891a87318e20218e0
FirebaseSessions: 5f9e62cd4096e24d2011cbd845b0efceffaee1ec
Google-Mobile-Ads-SDK: eba3109a9aa504596a207e4d18d433b329596b76
GoogleAppMeasurement: 0ba93018e916f7badf915c2337d43cc1fa96b3f9
GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
GoogleUserMessagingPlatform: 5f8b30daf181805317b6b985bb51c1ff3beca054
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
shared: fb5e8d42a33a32efb5a1afa48ea80e1a2a9840f3

PODFILE CHECKSUM: b8dd2b271efca238eaf5bf83c03f19dcc4a59504
PODFILE CHECKSUM: c12a7abff35ee3f072d38976340e7906474f416f

COCOAPODS: 1.15.0
140 changes: 1 addition & 139 deletions iosApp/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 23abcae

Please sign in to comment.