Skip to content

Commit 11349df

Browse files
danil-pavlovdanil-pavlov
authored
update: new ios deployment version (#4614)
1 parent cd60c1c commit 11349df

File tree

5 files changed

+40
-15
lines changed

5 files changed

+40
-15
lines changed

‎docs/topics/multiplatform/multiplatform-ios-dependencies.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ have some other strong reason to do so.
2626
```kotlin
2727
kotlin {
2828
cocoapods {
29+
version = "2.0"
2930
//..
3031
pod("FirebaseAuth") {
3132
version = "10.16.0"
33+
extraOpts += listOf("-compiler-option", "-fmodules")
3234
}
3335
}
3436
}
@@ -40,9 +42,11 @@ have some other strong reason to do so.
4042
```groovy
4143
kotlin {
4244
cocoapods {
45+
version = "2.0"
4346
//..
4447
pod('FirebaseAuth') {
4548
version = '10.16.0'
49+
extraOpts += ['-compiler-option', '-fmodules']
4650
}
4751
}
4852
}

‎docs/topics/multiplatform/native-cocoapods-dsl-reference.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ The `framework` block is nested inside `cocoapods` and configures the framework
105105
```kotlin
106106
kotlin {
107107
cocoapods {
108+
version = "2.0"
108109
framework {
109110
baseName = "MyFramework"
110111
isStatic = false
@@ -136,15 +137,16 @@ and `source` of the library, in its configuration block:
136137
```kotlin
137138
kotlin {
138139
iosArm64()
139-
140140
cocoapods {
141+
version = "2.0"
141142
summary = "CocoaPods test library"
142143
homepage = "https://github.com/JetBrains/kotlin"
143144

144-
iosArm64.deploymentTarget = "13.5"
145+
ios.deploymentTarget = "16.0"
145146

146147
pod("pod_dependency") {
147148
version = "1.0"
149+
extraOpts += listOf("-compiler-option", "-fmodules")
148150
linkOnly = true
149151
source = path(project.file("../pod_dependency"))
150152
}

‎docs/topics/multiplatform/native-cocoapods-libraries.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@ version of the library, you can just omit this parameter altogether.
3737
iosArm64()
3838

3939
cocoapods {
40-
iosArm64.deploymentTarget = "13.5"
40+
version = "2.0"
41+
ios.deploymentTarget = "16.0"
4142

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

4546
pod("FirebaseAuth") {
4647
version = "10.16.0"
48+
extraOpts += listOf("-compiler-option", "-fmodules")
4749
}
4850
}
4951
}
@@ -77,21 +79,25 @@ import cocoapods.FirebaseAuth.*
7779
iosArm64()
7880

7981
cocoapods {
82+
version = "2.0"
8083
summary = "CocoaPods test library"
8184
homepage = "https://github.com/JetBrains/kotlin"
8285

83-
iosArm64.deploymentTarget = "13.5"
86+
ios.deploymentTarget = "16.0"
8487

8588
pod("pod_dependency") {
8689
version = "1.0"
90+
extraOpts += listOf("-compiler-option", "-fmodules")
8791
source = path(project.file("../pod_dependency"))
8892
}
8993
pod("subspec_dependency/Core") {
9094
version = "1.0"
95+
extraOpts += listOf("-compiler-option", "-fmodules")
9196
source = path(project.file("../subspec_dependency"))
9297
}
9398
pod("FirebaseAuth") {
9499
version = "10.16.0"
100+
extraOpts += listOf("-compiler-option", "-fmodules")
95101
}
96102
}
97103
}
@@ -138,27 +144,31 @@ import cocoapods.FirebaseAuth.*
138144
iosArm64()
139145

140146
cocoapods {
147+
version = "2.0"
141148
summary = "CocoaPods test library"
142149
homepage = "https://github.com/JetBrains/kotlin"
143150

144-
iosArm64.deploymentTarget = "13.5"
151+
ios.deploymentTarget = "16.0"
145152

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

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

158167
pod("CocoaLumberjack") {
159168
source = git("https://github.com/CocoaLumberjack/CocoaLumberjack.git") {
160169
commit = "3e7f595e3a459c39b917aacf9856cd2a48c4dbf3"
161170
}
171+
extraOpts += listOf("-compiler-option", "-fmodules")
162172
}
163173
}
164174
}
@@ -186,10 +196,11 @@ import cocoapods.CocoaLumberjack.*
186196
iosArm64()
187197

188198
cocoapods {
199+
version = "2.0"
189200
summary = "CocoaPods test library"
190201
homepage = "https://github.com/JetBrains/kotlin"
191202

192-
iosArm64.deploymentTarget = "13.5"
203+
ios.deploymentTarget = "16.0"
193204

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

234245
cocoapods {
246+
version = "2.0"
235247
summary = "CocoaPods test library"
236248
homepage = "https://github.com/JetBrains/kotlin"
237249

238-
iosArm64.deploymentTarget = "13.5"
250+
ios.deploymentTarget = "16.0"
239251

240252
pod("YandexMapKit") {
241253
packageName = "YandexMK"
254+
extraOpts += listOf("-compiler-option", "-fmodules")
242255
}
243256
}
244257
}
@@ -278,10 +291,11 @@ kotlin {
278291
iosArm64()
279292

280293
cocoapods {
294+
version = "2.0"
281295
summary = "CocoaPods test library"
282296
homepage = "https://github.com/JetBrains/kotlin"
283297

284-
iosArm64.deploymentTarget = "13.5"
298+
ios.deploymentTarget = "16.0"
285299

286300
pod("PodName") {
287301
extraOpts = listOf("-compiler-option", "-fmodules")

‎docs/topics/multiplatform/native-cocoapods-xcode.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
3636
iosArm64()
3737

3838
cocoapods {
39+
version = "2.0"
3940
summary = "CocoaPods test library"
4041
homepage = "https://github.com/JetBrains/kotlin"
41-
iosArm64.deploymentTarget = "13.5"
42+
ios.deploymentTarget = "16.0"
4243
pod("FirebaseAuth") {
4344
version = "10.16.0"
45+
extraOpts += listOf("-compiler-option", "-fmodules")
4446
}
4547
podfile = project.file("../ios-app/Podfile")
4648
}
@@ -52,7 +54,7 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
5254
```ruby
5355
use_frameworks!
5456

55-
platform :ios, '13.5'
57+
platform :ios, '16.0'
5658

5759
target 'ios-app' do
5860
pod 'kotlin_library', :path => '../kotlin-library'
@@ -82,13 +84,15 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
8284
tvosArm64()
8385
8486
cocoapods {
87+
version = "2.0"
8588
summary = "CocoaPods test library"
8689
homepage = "https://github.com/JetBrains/kotlin"
87-
iosArm64.deploymentTarget = "13.5"
88-
tvosArm64.deploymentTarget = "13.4"
90+
ios.deploymentTarget = "16.0"
91+
tvos.deploymentTarget = "16.0"
8992
9093
pod("FirebaseAuth") {
9194
version = "10.16.0"
95+
extraOpts += listOf("-compiler-option", "-fmodules")
9296
}
9397
podfile = project.file("../severalTargetsXcodeProject/Podfile") // specify the path to the Podfile
9498
}
@@ -100,14 +104,14 @@ dependency by calling `pod install` manually for each Xcode project. In other ca
100104
```ruby
101105
target 'iosApp' do
102106
use_frameworks!
103-
platform :ios, '13.5'
107+
platform :ios, '16.0'
104108
# Pods for iosApp
105109
pod 'kotlin_library', :path => '../kotlin-library'
106110
end
107111
108112
target 'TVosApp' do
109113
use_frameworks!
110-
platform :tvos, '13.4'
114+
platform :tvos, '16.0'
111115
112116
# Pods for TVosApp
113117
pod 'kotlin_library', :path => '../kotlin-library'

‎docs/topics/multiplatform/native-cocoapods.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ If you already have a project, you can add and configure the Kotlin CocoaPods Gr
176176
kotlin {
177177
cocoapods {
178178
// Required properties
179-
// Specify the required Pod version here. Otherwise, the Gradle project version is used.
179+
// Specify the required Pod version here
180+
// Otherwise, the Gradle project version is used
180181
version = "1.0"
181182
summary = "Some description for a Kotlin/Native module"
182183
homepage = "Link to a Kotlin/Native module homepage"

0 commit comments

Comments
 (0)