Skip to content

Commit

Permalink
Kotlin 1.5.30, Compose alpha + related dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
joreilly committed Sep 17, 2021
1 parent 7736f85 commit fbc9029
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 82 deletions.
11 changes: 6 additions & 5 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@

object Versions {
const val kotlin = "1.5.21"
const val kotlinCoroutines = "1.5.1-native-mt"
const val ktor = "1.6.2"
const val kotlin = "1.5.30"
const val kotlinCoroutines = "1.5.2-native-mt"
const val ktor = "1.6.3"
const val kotlinxSerialization = "1.2.2"
const val koin = "3.1.2"
const val lifecycle = "2.2.0-alpha01"
const val compose = "1.0.2"
const val nav_compose = "2.4.0-alpha08"

const val compose = "1.1.0-alpha04"
const val nav_compose = "2.4.0-alpha09"
const val slf4j = "1.7.30"

const val kermit = "0.1.8"
Expand Down
19 changes: 9 additions & 10 deletions common/common.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Pod::Spec.new do |spec|
spec.license = ''
spec.summary = 'BikeShare common module'

spec.static_framework = true
spec.vendored_frameworks = "build/cocoapods/framework/common.framework"
spec.libraries = "c++"
spec.module_name = "#{spec.name}_umbrella"
Expand All @@ -17,13 +16,8 @@ Pod::Spec.new do |spec|


spec.pod_target_xcconfig = {
'KOTLIN_TARGET[sdk=iphonesimulator*]' => 'ios_x64',
'KOTLIN_TARGET[sdk=iphoneos*]' => 'ios_arm',
'KOTLIN_TARGET[sdk=watchsimulator*]' => 'watchos_x64',
'KOTLIN_TARGET[sdk=watchos*]' => 'watchos_arm',
'KOTLIN_TARGET[sdk=appletvsimulator*]' => 'tvos_x64',
'KOTLIN_TARGET[sdk=appletvos*]' => 'tvos_arm64',
'KOTLIN_TARGET[sdk=macosx*]' => 'macos_x64'
'KOTLIN_PROJECT_PATH' => ':common',
'PRODUCT_MODULE_NAME' => 'common',
}

spec.script_phases = [
Expand All @@ -32,10 +26,15 @@ 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\""
exit 0
fi
set -ev
REPO_ROOT="$PODS_TARGET_SRCROOT"
"$REPO_ROOT/../gradlew" -p "$REPO_ROOT" :common:syncFramework \
-Pkotlin.native.cocoapods.target=$KOTLIN_TARGET \
"$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
-Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
-Pkotlin.native.cocoapods.archs="$ARCHS" \
-Pkotlin.native.cocoapods.configuration=$CONFIGURATION \
-Pkotlin.native.cocoapods.cflags="$OTHER_CFLAGS" \
-Pkotlin.native.cocoapods.paths.headers="$HEADER_SEARCH_PATHS" \
Expand Down
2 changes: 1 addition & 1 deletion ios/BikeShare/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ EXTERNAL SOURCES:
:path: "../../common"

SPEC CHECKSUMS:
common: 71b0c52c1eec02792ae942ca52e7e05066dbe4af
common: 8ad42eef31288761720e98db2059735237a5ec68
Introspect: 50c17d6b1f091f4cfd678ea8a4157ac071808fe3
SwiftUIRefresh: ca6ae2718d25aad5dd68bbf5d2ae36ef6ade98bf

Expand Down
12 changes: 3 additions & 9 deletions ios/BikeShare/Pods/Local Podspecs/common.podspec.json

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

2 changes: 1 addition & 1 deletion ios/BikeShare/Pods/Manifest.lock

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

84 changes: 42 additions & 42 deletions ios/BikeShare/Pods/Pods.xcodeproj/project.pbxproj

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

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

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

0 comments on commit fbc9029

Please sign in to comment.