From 2f452062681ba3414fb464679576ecc4f0d44d3c Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Mon, 4 Mar 2019 14:47:32 +0300
Subject: [PATCH] CocoaPods: Replace dynamic dummy framework with a static one

---
 .../kotlin/gradle/tasks/CocoapodsTasks.kt     |  31 ++++++++++++++++--
 .../cocoapods/dummy.framework/Info.plist      | Bin 708 -> 687 bytes
 .../resources/cocoapods/dummy.framework/dummy | Bin 23120 -> 5568 bytes
 3 files changed, 28 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/dummy

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CocoapodsTasks.kt
index 7ed9e4d4ce5..f3bb1017015 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CocoapodsTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CocoapodsTasks.kt
@@ -16,7 +16,7 @@ import java.io.File
  * The task generates a podspec file which allows a user to
  * integrate a Kotlin/Native framework into a Cocoapods project.
  */
-open class PodspecTask: DefaultTask() {
+open class PodspecTask : DefaultTask() {
 
     @OutputFile
     val outputFile: File = project.projectDir.resolve("${project.name}.podspec")
@@ -90,7 +90,7 @@ open class PodspecTask: DefaultTask() {
  * So we create a dummy static framework to allow Cocoapods install our pod correctly
  * and then replace it with the real one during a real build process.
  */
-open class DummyFrameworkTask: DefaultTask() {
+open class DummyFrameworkTask : DefaultTask() {
     @OutputDirectory
     val destinationDir = project.cocoapodsBuildDirs.framework
 
@@ -110,12 +110,31 @@ open class DummyFrameworkTask: DefaultTask() {
         }
     }
 
+    private fun copyTextResource(from: String, to: File, transform: (String) -> String = { it }) {
+        to.parentFile.mkdirs()
+        to.printWriter().use { file ->
+            javaClass.getResourceAsStream(from).reader().forEachLine {
+                file.println(transform(it))
+            }
+        }
+    }
+
     private fun copyFrameworkFile(relativeFrom: String, relativeTo: String = relativeFrom) =
         copyResource(
             "/cocoapods/dummy.framework/$relativeFrom",
             frameworkDir.resolve(relativeTo)
         )
 
+    private fun copyFrameworkTextFile(
+        relativeFrom: String,
+        relativeTo: String = relativeFrom,
+        transform: (String) -> String = { it }
+    ) = copyTextResource(
+        "/cocoapods/dummy.framework/$relativeFrom",
+        frameworkDir.resolve(relativeTo),
+        transform
+    )
+
     @TaskAction
     fun create() {
         // Reset the destination directory
@@ -127,8 +146,14 @@ open class DummyFrameworkTask: DefaultTask() {
         // Copy files for the dummy framework.
         copyFrameworkFile("Info.plist")
         copyFrameworkFile("dummy", frameworkName)
-        copyFrameworkFile("Modules/module.modulemap")
         copyFrameworkFile("Headers/dummy.h")
+        copyFrameworkTextFile("Modules/module.modulemap") {
+            if (it == "framework module dummy {") {
+                it.replace("dummy", frameworkName)
+            } else {
+                it
+            }
+        }
     }
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Info.plist b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/Info.plist
index 8fcb3c949a9e4b2fabe0d8066d5b9e0896644d9f..bb3631678fa222c5ecafc79f7ea0cd2bfa6c0d5f 100644
GIT binary patch
delta 141
zcmX@Yx}J4{E}Md~imICWM&pHyoDrD;8Toms{=t)<F=`r`IawM;WEOx#@{2<Zjr0s-
zU_1~f#L&RdAk@&n$;>d=LeF54hUR2HCP(wTjQ5#Xn7EjPnIxE0nY5S;m`s?=nJgK=
QfQb=8GiX6+D8*zA0HZn`RR910

delta 162
zcmZ3_dW3a?E}OE7s)CZ*M&pHyLh%CpnE@I3d8xsfxurRYCHX~@?=ouI8#tL6f}{#S
zQpGT-5JMw9!%#yrCrhBDFq$MtF2vBl&|s0e#$<CQN7HAFFPM0lgqc*Cw3rN-+?c$X
V{Fnk5z<`MnLNjPWX(+`M1OO}aCVl__

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/dummy b/libraries/tools/kotlin-gradle-plugin/src/main/resources/cocoapods/dummy.framework/dummy
old mode 100755
new mode 100644
index 861837242d0918e72bef69c07e6f84091d3d72c7..99a9edee74893015b297c4eab0411c2a52749f55
GIT binary patch
literal 5568
zcmeHLOKenC7(REV(?SPFOeI2Gc!6R{V&~BZ(4vJx3zYD(Q=mx9<<8vG_R^U<<DEN0
zYfNO}(!{ON4X!kCsTkwJtws~;Mu`g-x^iPe!bT)PzwbWU>AX!?DDiLp^Z4(7zWbkZ
z|8vea{pR5pUkV{Y&~4DI(4-K(P!Uo*8=Ae>gor{#c=wCCon4yf-J41bCDjc{jgF=c
zjE#*XhgEenIfMt^<5V(vU}Qv94?#V-)~jjp^p&$y(<jvQ`PsSYDd39jEFkYfpZ4nk
z)S6Mw=T|RDyJQxubLD(S+M8`@$2P4+(IlSXu|tjH85$lt5X9rYLaX2%@d94y%6EVM
z{xDb&tb^!+F0oLBVE=9yMFSav&s$K|J$O!y`F@(_$Q5T}kfzN|&(Cf2gBHiv$jzXy
zY1x8R+5l;U!H-9bCLsz<%a~5KU`QWS)6Sf^bT)W{n*i<{Kdp~r-3f8zjhtyU!$`rC
z>vX#%h9NWMMXlu6F0Q6cU7nmhvHp%Bv|a_sXZ0A&S64L6!_YGsTUL-SH5l(;d>Wp8
z-Tr`$st&`n7ToV&i}5QkiWs-xV|>2F+b}TIVc5F0C`<Km%=(@`b`VEi&$^-1#z73O
zX=@C<Sj<Vy((??XZavb#n1}sN%Q!rYLgsoFu5}n61EU}I1e1HS__O4gsyK>zwstOS
zK1R9&3}?02a4z?Nv4HpAXo=zFN06$uaa_SB`3V?5x4_tk=id2*4-eracS65Lm#O&&
z>I<l&P}UUs1X`cIu1nkE=)m6n7iQ0&oSi&7?w(Pqitg#@<8xkjFx6XyarcN2ll=B7
zceBdl3`eG#O2+Z04rFu4%t0K-$#^Oi9~q60?iY!RC3q#SODALNrd3LuG10JB6H~Gx
zbA_U`6Z1SL(6`NsG^TV%Pq>i`F0L**mE4k3b{yR(;!LtCrAp3NaF!jJI94`uMq<Wt
zq@9<BsXMY1w+g0Z$Q5sRJmY%I%AC|oa?mU;6)agOZF=axGhHa#S?NFW4(V)t;5Q2P
zazd^kVlyu-r<BMRvU;&#_~S(NE#lu8WvgT^TGCLnOS&ye=IfGqw#n1KZ;V1YlaoSu
zO4%3di-cp_yPu8y@+NMF(1-}fX8Mk78;>52hVU`MiZauOq}VNH`u0Q*A|WErqbWpp
zKRhR*QCND|j7BGzEjcK&1Vgy7aRnz>L4JcOp<S@LC#ljEaZmH`1nga>>CrDD$5C~^
z0G};N&p4}|&~a4Uw2Bgmga^=wEYax_%w0&+Q|ZZ5Xs)LwuQ&>Aitx^azaY21`aU1K
zyu5k{_ES*8(&uF;g@LjEoZH*LrHxXHOU&Tio%jS>hg5*V$uqvNh+xZc>4YGrdiACI
zw?6##{!#SPP|lP1oHUOp2-k-uE|zcl0nLzDL#ZeaVo#t{=t0N-(3TKht_FL8Gr+kE
z#o~1h`ZYgb46Bz!y`OCyM#0_uWJnbQu<d}d?MkPFE2rghm3%y40e)A4pc#fV;`xG6
z#-0(64PQK%^y%)k-bQ?J&Et#iM_|D-UyZPULUutvqOpmL`_GPY3?%6DTB80_4oM73
zfamqx@@7>V_jG$cNq^=Kg?LD(rqT(w<X|sb!K?iFHUsR0XIA6A))ucl=Oi9^C&jME
z^A2q9G1jj=|D-DqC(2q2-o@tuUMnt2zZDjcJw9)F1Hat-z#7KajF-N$$y<o`TJRvg
zFNm)hM-A|T@7o@)iYL1Gn|}jb_2Zl8%OUT#jjuI#{lv%X_u$064)I(*-GIm5slj^&
zmu!t}TH$~fH{-Mqd~fnv%Hg(nt@*9)Z&q?#$_H)m_Q7Yn>*+Z%oSo3OkzcfI1It-L
z%_}(Ix=d**ee2<2>_GnKy5QH3HP_|;EWG62;vNo-xb7%?6s2qH`VA94220mDCJ^}U
zNmLE^?lR2ayIWnpOV>z|j*p7-UL+*s-_ChCY5!OYI4>8>H$BFjH;Y*!v$}oG+pVJ?
z3oanEud?r@9$G^1g9e<K{c4WP{&{G?li9E4&Fm98;Lhyt@cV4L@@P49&dC>t1<N6~
MOu1ze|CNRO4GQL~b^rhX

literal 23120
zcmeI0U1%It6vyx6qm3ptTGXgjvf3a?H9Ku7HN>K^No*3EbV*XlgLItTxk)D3oeA@?
z-7O*!Y$f1B{Y0S!!L(M3MG>I|LxUeQg3y|mB0?4HL;b=Qe2AeG&zYGdyDLQ>RsI*w
z-21<K?#KDvyASuAUHtXhY9W+zA;c=OS~5XmzqpxO;!d(lWSTbEIW)*UB_(uQ>5MeZ
zDJsdzqF*%4lR0n2t#rO~!NM!QmugWVCRcvt{iJNmU77HD^KFa<@q8796O^<$&Mq=d
z+u7asL}y3$QmjkyC87b5PV|JD<5Z%bxLQNjLUspP*w0@@v^f*HH>w(bCX<g3J9<X$
zwVm-$lY_WVh{>hBvc7Ji_1TZP@)|9qZ=iaP>dUlLHMJ9DT=+cM*td$TaGxaqQCUY`
zyw3BfXJ)jITCaV4?*rLyKdlp+sV_#x@e8FUFrJ_9k*Il7*+3O-X}OTcG8f)Y<=jO&
z4n?TG>!@in$u^L8J(-Dbj~jVX;n2H@OCvRTe4EV4l<(=uwA2Eck1ug_MUh|H)(z?W
z#fN9SpN#jlkv`0%Dbmc5%ROY=oLwu#!5!R#0s<fa0w4eaAOHd&00JNY0{>0|ZH?=j
z68*b&^gq_y8ay^*F_Jx<?Sr9g-gINZ#xFlA6fJOjQaY|_TjCZ`HsCp?H6qsc`I)42
zL}R%)S5NP{h5CYl;$ad-LC0?;`YP$+az%Xc{obe8?K65D#<&rc^Cg<!js}0C!f(V{
z`Yc3wf!ia!lo#OlCAlw;h>4;&qP-XOMRC#N($HMbPijfiqGzH|ce@n4IwrlOqnnni
z?lh_4<kb$Dm1%oII_gl$HY91s%u1s}_w?}L-aL{Y@v`Yr&-Xmtn4pY=m36aeW7r$_
zq`KWV(}vn@dD6*9!_+<L#x0xI%td*CWZ=;+(^7Y3vpF$pThcW%ep>fzr^qK-dcgLb
zlyp@QoSBxTeaBP(i2!yb$7ITLn=RYP=xH_AvQ^u<B@8hP!!AC+=&*_oFgn!ehJ@AP
zg_>Eq2HQvlsRybX$mr%Mjp6N3wvZ3&3Q-nhfcR>CPBuiwV@R)^jg<u{29keQqC^3?
zg~^=YD}HHz^@o%3E3a4$^QSV8Or4%?h&`9;div_BLx-QOfA{R_H}bKAeaGcZe(uG}
zp0_^e?;D#uedeyWn-}IEI$GEM$AQ-l?5Uo=b=#Nm4f~JGoj5jAyJ@iF%F$0A+%s9%
zd;CP}hYiW8nX2)s-j?0&dqbN4{_8U@FP=I1^VjV!WD{finx>AJ<rjz6TsnMy>btJ5
z_D#R^(>JH)sy0{Yw@v%U-uZFe@5F%rE1X6Vix;Z7&FK#m5C8!X009sH0T2KI5C8!X
z009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X009sH
q0T2KI5C8!X009sH0T2KI5C8!X009sH0T2KI5C8!X0D=Drfj<Fzc$07d