Merge branch 'develop' into fixes/xcode10.2

readium · May 23, 2019 · bee76b3 · bee76b3
2 parents ea6e5e5 + dc3d2f6
commit bee76b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,6 +1,6 @@
-github "readium/r2-shared-swift" "develop"
+github "readium/r2-shared-swift" == 1.2.9
+github "tadija/AEXML" == 4.3.3
+github "swisspol/GCDWebServer" == 3.5.2
+github "krzyzanowskim/CryptoSwift" == 0.15.0
 github "cezheng/Fuzi" == 2.2.1
 github "dexman/Minizip"
-github "krzyzanowskim/CryptoSwift" == 0.15.0
-github "swisspol/GCDWebServer" == 3.5.2
-github "tadija/AEXML" == 4.3.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,6 @@
 github "cezheng/Fuzi" "2.2.1"
 github "dexman/Minizip" "1.4.0"
-github "readium/r2-shared-swift" "678dbfede1e24ea5b924955176a331206b1a4450"
 github "krzyzanowskim/CryptoSwift" "0.15.0"
+github "readium/r2-shared-swift" "1.2.9"
 github "swisspol/GCDWebServer" "3.5.2"
-github "tadija/AEXML" "4.3.3"
+github "tadija/AEXML" "4.3.3"