Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update: new ios deployment version #4614

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update: new ios deployment version #4614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab28d23
update: new ios version
danil-pavlov Dec 13, 2024
ea73343
update: more code changes
danil-pavlov Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/topics/multiplatform/multiplatform-ios-dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ have some other strong reason to do so.
```kotlin
kotlin {
cocoapods {
version = "2.0"
//..
pod("FirebaseAuth") {
version = "10.16.0"
extraOpts += listOf("-compiler-option", "-fmodules")
}
}
}
Expand All @@ -40,9 +42,11 @@ have some other strong reason to do so.
```groovy
kotlin {
cocoapods {
version = "2.0"
//..
pod('FirebaseAuth') {
version = '10.16.0'
extraOpts += ['-compiler-option', '-fmodules']
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions docs/topics/multiplatform/native-cocoapods-dsl-reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ The `framework` block is nested inside `cocoapods` and configures the framework
```kotlin
kotlin {
cocoapods {
version = "2.0"
framework {
baseName = "MyFramework"
isStatic = false
Expand Down Expand Up @@ -136,15 +137,16 @@ and `source` of the library, in its configuration block:
```kotlin
kotlin {
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

pod("pod_dependency") {
version = "1.0"
extraOpts += listOf("-compiler-option", "-fmodules")
linkOnly = true
source = path(project.file("../pod_dependency"))
}
Expand Down
26 changes: 20 additions & 6 deletions docs/topics/multiplatform/native-cocoapods-libraries.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ version of the library, you can just omit this parameter altogether.
iosArm64()

cocoapods {
iosArm64.deploymentTarget = "13.5"
version = "2.0"
ios.deploymentTarget = "16.0"

summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

pod("FirebaseAuth") {
version = "10.16.0"
extraOpts += listOf("-compiler-option", "-fmodules")
}
}
}
Expand Down Expand Up @@ -77,21 +79,25 @@ import cocoapods.FirebaseAuth.*
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

pod("pod_dependency") {
version = "1.0"
extraOpts += listOf("-compiler-option", "-fmodules")
source = path(project.file("../pod_dependency"))
}
pod("subspec_dependency/Core") {
version = "1.0"
extraOpts += listOf("-compiler-option", "-fmodules")
source = path(project.file("../subspec_dependency"))
}
pod("FirebaseAuth") {
version = "10.16.0"
extraOpts += listOf("-compiler-option", "-fmodules")
}
}
}
Expand Down Expand Up @@ -138,27 +144,31 @@ import cocoapods.FirebaseAuth.*
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

pod("FirebaseAuth") {
source = git("https://github.com/firebase/firebase-ios-sdk") {
tag = "10.16.0"
}
extraOpts += listOf("-compiler-option", "-fmodules")
}

pod("JSONModel") {
source = git("https://github.com/jsonmodel/jsonmodel.git") {
branch = "key-mapper-class"
}
extraOpts += listOf("-compiler-option", "-fmodules")
}

pod("CocoaLumberjack") {
source = git("https://github.com/CocoaLumberjack/CocoaLumberjack.git") {
commit = "3e7f595e3a459c39b917aacf9856cd2a48c4dbf3"
}
extraOpts += listOf("-compiler-option", "-fmodules")
}
}
}
Expand Down Expand Up @@ -186,10 +196,11 @@ import cocoapods.CocoaLumberjack.*
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

specRepos {
url("https://github.com/Kotlin/kotlin-cocoapods-spec.git")
Expand Down Expand Up @@ -232,13 +243,15 @@ import cocoapods.example.*
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

pod("YandexMapKit") {
packageName = "YandexMK"
extraOpts += listOf("-compiler-option", "-fmodules")
}
}
}
Expand Down Expand Up @@ -278,10 +291,11 @@ kotlin {
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"

iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"

pod("PodName") {
extraOpts = listOf("-compiler-option", "-fmodules")
Expand Down
16 changes: 10 additions & 6 deletions docs/topics/multiplatform/native-cocoapods-xcode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,13 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
iosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"
iosArm64.deploymentTarget = "13.5"
ios.deploymentTarget = "16.0"
pod("FirebaseAuth") {
version = "10.16.0"
extraOpts += listOf("-compiler-option", "-fmodules")
}
podfile = project.file("../ios-app/Podfile")
}
Expand All @@ -52,7 +54,7 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
```ruby
use_frameworks!

platform :ios, '13.5'
platform :ios, '16.0'

target 'ios-app' do
pod 'kotlin_library', :path => '../kotlin-library'
Expand Down Expand Up @@ -82,13 +84,15 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
tvosArm64()

cocoapods {
version = "2.0"
summary = "CocoaPods test library"
homepage = "https://github.com/JetBrains/kotlin"
iosArm64.deploymentTarget = "13.5"
tvosArm64.deploymentTarget = "13.4"
ios.deploymentTarget = "16.0"
tvos.deploymentTarget = "16.0"

pod("FirebaseAuth") {
version = "10.16.0"
extraOpts += listOf("-compiler-option", "-fmodules")
}
podfile = project.file("../severalTargetsXcodeProject/Podfile") // specify the path to the Podfile
}
Expand All @@ -100,14 +104,14 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
```ruby
target 'iosApp' do
use_frameworks!
platform :ios, '13.5'
platform :ios, '16.0'
# Pods for iosApp
pod 'kotlin_library', :path => '../kotlin-library'
end

target 'TVosApp' do
use_frameworks!
platform :tvos, '13.4'
platform :tvos, '16.0'

# Pods for TVosApp
pod 'kotlin_library', :path => '../kotlin-library'
Expand Down
3 changes: 2 additions & 1 deletion docs/topics/multiplatform/native-cocoapods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ If you already have a project, you can add and configure the Kotlin CocoaPods Gr
kotlin {
cocoapods {
// Required properties
// Specify the required Pod version here. Otherwise, the Gradle project version is used.
// Specify the required Pod version here
// Otherwise, the Gradle project version is used
version = "1.0"
summary = "Some description for a Kotlin/Native module"
homepage = "Link to a Kotlin/Native module homepage"
Expand Down
Loading