From edb8b9a03275eb46cab0d0d66d3cfe0975268d0c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 26 Oct 2016 11:11:54 +0200
Subject: [PATCH 1/4] Updating to version 1.2

---
 .DS_Store                | Bin 0 -> 6148 bytes
 J2ObjC-Framework.podspec |   4 ++--
 Scripts/.DS_Store        | Bin 0 -> 6148 bytes
 Scripts/download.sh      |   4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 Scripts/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3c92e4bdc578c8974be9a6a2295416b98390006b
GIT binary patch
literal 6148
zcmeHKU5nE|6ur|{`>`((6&HNTqe3lhW!cwmw-qX`mW}KpuGXXp+pIAuO}a%&q2QZ8
z!|&fA`sNSNcYlO$^~_{i+Em{bk!5bUb8cqtxyc;JOooV9eP~yRG$P8uIc5rI{$PBZ
z`<kU>Paeob4TB;IXh2TOTgz4*N&%(7|E2){cJoxC1{u_WFTUTPYk7f%Q7jGV6X1=R
zFfoA)7{}yN)bf_|=uRT9fE=GfR5i)NRYKfLaK0rtn{=0|^nffnp<TL#ngg(3kV7M}
zwme6bJ|Y{n`snSh)?@p;9-Pf)Xo<3Pk6NhIr2Cj(Gm-rr8Ot-v(>^kHpvNAtgy-6;
zjMUQvBa5nCyrYY^i6~5D|K!>5)Z%ScvaM0rmpcEl`kos`<?;`fN@p%y%;xfi4Ss2t
z3Qvq)Fft-D8isXq@L1frwqwb-ZAQI${4fZ-MQmCJt~2UrS9SwGGF{&pEK!dRUEdBy
z^<e1R;gJ#7J9O=+*U_%F2hJ&|ZPRxS+|adL&y8N@^8D&(*T&;Yxu|cICq;c+sg`dS
z_3i5RWTL&w<*wh{+Sz;5pS*ta_TBprA3uHmg4x3ub_ijYCC=e1f`o>r#=!Ri{}>~4
z);wF`*(o5k&25}rNmWTHpcFVK3h?zohjXk+oW>}Y4m9Ej0L-9U7-D{w;2d3IP2x00
zjKEk-1;$h+j~FbbqhFVKHHp(0V>&T;_+awMOrB7fcslCqBAr+*M%5|>lme>?q~lwS
z@BhuepZ`}$>P{)36gXE3uuQ{f)G;Nwx2{c&@3lJo8Jru>o5m<8XykS*0=^Y*!i8Z>
Y=K-)LaT+6fVCqLe$e<dfz&};sH@^|PNB{r;

literal 0
HcmV?d00001

diff --git a/J2ObjC-Framework.podspec b/J2ObjC-Framework.podspec
index 345b30a6..2d60e0b9 100644
--- a/J2ObjC-Framework.podspec
+++ b/J2ObjC-Framework.podspec
@@ -1,4 +1,4 @@
-@version = "1.0.2.2"
+@version = "1.2"
 
 Pod::Spec.new do |s|
   s.name         		= "J2ObjC-Framework"
@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.homepage        = "https://actor.im/"
   s.license         = { :type => 'MIT', :file => 'LICENSE' }
   s.author       		= { "Actor LLC" => "steve@actor.im" }
-  s.source          = { :git => "https://github.com/actorapp/J2ObjC-Framework.git", :tag => "v#{s.version}" }
+  s.source          = { :git => "https://github.com/Daeda88/J2ObjC-Framework.git", :tag => "v#{s.version}" }
 
   s.platform     		= :ios, "8.0"
   s.requires_arc 		= true
diff --git a/Scripts/.DS_Store b/Scripts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0f6b43e53b67cce71fe55961877aeef76abb3961
GIT binary patch
literal 6148
zcmeHKyH3ME5S)b+hBPTDucV5^A6St=N{i`%JR}N(5f~7iKadaLZ^G=}5yi%$L@3&o
z_U2x5>l?{;w*X}JvN{7M05ZCwXl1~(dvNF=O&$@&)+o`S#uL`_YG9%N*rnfogeeM?
zxTbHvzg{k?dcjdjBcH_6jhSuY7)$Q+0k2qdw+;D^c%N6h99;A`W30$|Bda3bvNgps
z?s}{bWzl7`u}B%N7~`JnSL8IR>~0jf>_st>7p{OS;0m|`uD~w}@Xl7t#u2@A1zZ7F
zV5@+h4}q?jCu}3y(ZRw}0HQvl%~;o5LOCH}p0JI`5t>9QF;XR^7!v914{2VWu#Fh$
zkd%B#iu|3th(+i6!KOp<h+et^u0U6T!`PhY{eRA1W-!U`QoQ8~xB`2ofQ*W=m~m6-
zZvC-6y=w#ghOVabTCLDn?>qw7&~xO(2IF|pI_KpH+lab~_8Xn(4*?Uz3s>L|6!-$V
CCO^pl

literal 0
HcmV?d00001

diff --git a/Scripts/download.sh b/Scripts/download.sh
index 5b3158ad..323cac94 100755
--- a/Scripts/download.sh
+++ b/Scripts/download.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -ev
 
-j2objc_version=1.0.2
-sha1_checksum=6f2f45b323ef92cc8d1b13dd789aebd1ab87562f
+j2objc_version=1.2
+sha1_checksum=e25a4a6eb57155cbb6ece2c316aed67ccabef599
 
 echo "fetching j2objc dist"
 curl -OL https://github.com/google/j2objc/releases/download/${j2objc_version}/j2objc-${j2objc_version}.zip

From 9c1fa43d21284d0917f4d41d347f51470041224c Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 26 Oct 2016 11:41:27 +0200
Subject: [PATCH 2/4] Fixed checksum

---
 .DS_Store           | Bin 6148 -> 6148 bytes
 Scripts/download.sh |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index 3c92e4bdc578c8974be9a6a2295416b98390006b..10b1dff472fce71fb31dd23e24c02622a9745f09 100644
GIT binary patch
delta 52
zcmZoMXffC@iG_uMfq{AQG!}nGmd(#tVj0EF&2<z^4Qh21stt_{jCB;ujm&Fn1zI*o
Iv8@sW0AxiCx&QzG

delta 52
zcmZoMXffC@iG}4q5KNxN;?Kyq`58+rqqw1gj)JK{t&T#qp^<^Hj)J+7d2Ovg^X4eF
GRe}HuTM?oF

diff --git a/Scripts/download.sh b/Scripts/download.sh
index 323cac94..354668d8 100755
--- a/Scripts/download.sh
+++ b/Scripts/download.sh
@@ -2,7 +2,7 @@
 set -ev
 
 j2objc_version=1.2
-sha1_checksum=e25a4a6eb57155cbb6ece2c316aed67ccabef599
+sha1_checksum=62988333bcf505514a1af8aa37ee00c5f2b59c35
 
 echo "fetching j2objc dist"
 curl -OL https://github.com/google/j2objc/releases/download/${j2objc_version}/j2objc-${j2objc_version}.zip

From d6e6223a90f142e18759adbf23d6c2321796182d Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Wed, 26 Oct 2016 11:44:37 +0200
Subject: [PATCH 3/4] Added gitignore

---
 .DS_Store         | Bin 6148 -> 0 bytes
 .gitignore        |  16 ++++++++++++++++
 Scripts/.DS_Store | Bin 6148 -> 0 bytes
 3 files changed, 16 insertions(+)
 delete mode 100644 .DS_Store
 create mode 100644 .gitignore
 delete mode 100644 Scripts/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 10b1dff472fce71fb31dd23e24c02622a9745f09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKU60a06uko|g?*_}<0iiJQ4=IAX2UDXf(gb|vNgLgu3}4@rE6^oElUg`;lU?=
zhTp%#=$k)4-~AE3;hE_`_|UhFF`K!~opU>L&+W`fm|=*B)dtQMkxoP!oMR@B<`2fl
zxvyDD_T+#})G#Tgkox2{{k3e>p%hRG{BH{I-)@eIR40?#@cHjI?AU&2V-#CM`UH4m
zDoiXO1I96V6gU0FJi4=zmq$)O5vp3`<0&HUu5i9_4m>@birSlWm&){jY&xM`x`mp3
zuwRf%L$S9!N0lBT2eo?W?JU=0`?6j}*2~g8YNAqu?qhw8mF(|4dtqfc+DGON^w<Ly
z@m*(`k$Sqq$f9ZobM!Eqn4*>JpK>;-`D~W5?P1iDI{&hJz8A%%(hrtOXD(dKYPtLd
zfAmZFCuTPsnz0oRqMFrzEZ#iFwPoD0;_fVd7>52lw(JAX9k%r=yI~MpUf}i@s7Hrh
z;Dp0kI0&5R$V}=TdQRMJ>sMQS_Y~BY6}Sgp<k_C@#V@rSf7<%B(Wp`>7~7?B!5D3o
zOScO~rCb@0^;ep9{pR-0-lN|5^_#cv-hcS`>GKyT0An~Igk6?6gRclyG(0u?fgc9P
z7@4tV*$U520jaIFadstDC8dB;;G8JH_Xh*cu_|$rpx8Rlh${dvgKlAn`CWo@42e~V
zlLRpWV+j?QP?@}9u!N3&L*`W_P7+M$#N_3J$uBc`Lt*0UsBegLV$}pys}xWQEGv*s
zUUh!{H~xPAUnZ$HrGQf4Tq(dZb+cZ>lH}RCwm5#)8t`XuZai<2prD|U$FT_bQM?Hk
bhB1Q&z^cSag6M&%KLSDq)hGr2sRF+NvU;~*

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..389fde53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+### OS-X ###
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+._*
+.Spotlight-V100
+.Trashes
+
+
+### Windows ###
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
diff --git a/Scripts/.DS_Store b/Scripts/.DS_Store
deleted file mode 100644
index 0f6b43e53b67cce71fe55961877aeef76abb3961..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3ME5S)b+hBPTDucV5^A6St=N{i`%JR}N(5f~7iKadaLZ^G=}5yi%$L@3&o
z_U2x5>l?{;w*X}JvN{7M05ZCwXl1~(dvNF=O&$@&)+o`S#uL`_YG9%N*rnfogeeM?
zxTbHvzg{k?dcjdjBcH_6jhSuY7)$Q+0k2qdw+;D^c%N6h99;A`W30$|Bda3bvNgps
z?s}{bWzl7`u}B%N7~`JnSL8IR>~0jf>_st>7p{OS;0m|`uD~w}@Xl7t#u2@A1zZ7F
zV5@+h4}q?jCu}3y(ZRw}0HQvl%~;o5LOCH}p0JI`5t>9QF;XR^7!v914{2VWu#Fh$
zkd%B#iu|3th(+i6!KOp<h+et^u0U6T!`PhY{eRA1W-!U`QoQ8~xB`2ofQ*W=m~m6-
zZvC-6y=w#ghOVabTCLDn?>qw7&~xO(2IF|pI_KpH+lab~_8Xn(4*?Uz3s>L|6!-$V
CCO^pl


From a32efeb5b8ff6427d6ccd77c976002b541ac0308 Mon Sep 17 00:00:00 2001
From: Gijs van Veen <gijs@splendo.com>
Date: Mon, 21 Nov 2016 11:32:01 +0100
Subject: [PATCH 4/4] Added support for osx

---
 J2ObjC-Framework.podspec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/J2ObjC-Framework.podspec b/J2ObjC-Framework.podspec
index 2d60e0b9..88c87b2f 100644
--- a/J2ObjC-Framework.podspec
+++ b/J2ObjC-Framework.podspec
@@ -9,7 +9,8 @@ Pod::Spec.new do |s|
   s.author       		= { "Actor LLC" => "steve@actor.im" }
   s.source          = { :git => "https://github.com/Daeda88/J2ObjC-Framework.git", :tag => "v#{s.version}" }
 
-  s.platform     		= :ios, "8.0"
+  s.ios.deployment_target = "8.0"
+  s.osx.deployment_target = "10.11"
   s.requires_arc 		= true
 
   s.frameworks      = 'Security'