Merge pull request #1410 from calabash/release/0.21.10

Release/0.21.10

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.21.9
+### 0.21.10
 
 Remove bundler as a dependency.
 
@@ -7,6 +7,10 @@ The embedded LPServer was build with Xcode 10.2 on macOS Mojave.
 The server version is 0.21.8 (not a typo), it is just trailing behind
 the gem version.
 
+### 0.21.9
+
+Never released.
+
 ### 0.21.8
 
 * gem: calabash-ios binary does not need CFPropertyList #1400

bin/ci/travis/run.sh

@@ -31,8 +31,8 @@ banner "Install Stubs for LPServer libs"
 mkdir -p calabash-cucumber/staticlib
 touch calabash-cucumber/staticlib/calabash.framework.zip
 mkdir -p calabash-cucumber/dylibs
-touch calabash-cucumber/dylibs/libCalabashDyn.dylib
-touch calabash-cucumber/dylibs/libCalabashDynSim.dylib
+touch calabash-cucumber/dylibs/libCalabashARM.dylib
+touch calabash-cucumber/dylibs/libCalabashSim.dylib
 
 banner "Install Gem"
 

calabash-cucumber/Rakefile

@@ -31,10 +31,8 @@ module Bundler
     # happen during development.
     def libraries_built?
       ['staticlib/calabash.framework.zip',
-       # Not yet, maybe never.
-       # 'dylibs/libCalabashDynFAT.dylib',
-       'dylibs/libCalabashDyn.dylib',
-       'dylibs/libCalabashDynSim.dylib'
+       'dylibs/libCalabashARM.dylib',
+       'dylibs/libCalabashSim.dylib'
       ].all? do |lib|
         File.size?(lib)
       end
@@ -63,8 +61,8 @@ end
 # Builds and installs the Objective-C libraries that this gem requires.
 #
 # * staticlib/calabash.framework.zip
-# * dylibs/libCalabashDyn.dylib
-# * dylibs/libCalabashDynSim.dylib
+# * dylibs/libCalabashARM.dylib
+# * dylibs/libCalabashSim.dylib
 #
 # Expects that the calabash-ios-server source code is located in:
 #  `../../calabash-ios-server.` If your server source code is in a different
@@ -156,9 +154,10 @@ Please run again without bundle exec.\033[0m
           exit 1
         end
 
-        ['libCalabashDynSim.dylib',
-         'libCalabashDyn.dylib',
-         'libCalabashFAT.dylib'].each do |dylib|
+        ['libCalabashSim.dylib',
+         'libCalabashARM.dylib',
+         'libCalabashFAT.dylib',
+         'Headers.zip'].each do |dylib|
 
            source = File.join('calabash-dylibs', dylib)
            target = File.join(gem_dylibs_dir, dylib)

calabash-cucumber/calabash-cucumber.gemspec

@@ -15,7 +15,7 @@ bin_help = %w(doc/calabash-ios-help.txt)
 staticlib = %w(staticlib/calabash.framework.zip)
 
 # calabash dylibs
-dylibs = %w(dylibs/libCalabashDyn.dylib dylibs/libCalabashDynSim.dylib)
+dylibs = %w(dylibs/libCalabashARM.dylib dylibs/libCalabashSim.dylib)
 
 # files in script
 scripts = %w(scripts/.irbrc)

calabash-cucumber/lib/calabash-cucumber/dylibs.rb

@@ -6,7 +6,7 @@ module Dylibs
 
       # @!visibility private
       def self.sim_dylib_basename
-        "libCalabashDynSim.dylib"
+        "libCalabashSim.dylib"
       end
 
       # @!visibility private
@@ -16,7 +16,7 @@ def self.path_to_sim_dylib
 
       # @!visibility private
       def self.device_dylib_basename
-        "libCalabashDyn.dylib"
+        "libCalabashARM.dylib"
       end
 
       # @!visibility private

calabash-cucumber/lib/calabash-cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.21.9"
+    VERSION = "0.21.10"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.

calabash-cucumber/spec/lib/dylibs_spec.rb

@@ -6,8 +6,8 @@
     FileUtils.rm_rf(path)
     FileUtils.mkdir_p(path)
 
-    FileUtils.touch(File.join(path, "libCalabashDynSim.dylib"))
-    FileUtils.touch(File.join(path, "libCalabashDyn.dylib"))
+    FileUtils.touch(File.join(path, "libCalabashSim.dylib"))
+    FileUtils.touch(File.join(path, "libCalabashARM.dylib"))
 
     expect(Calabash::Cucumber::Dylibs).to receive(:dylib_dir).and_return(path)
   end

calabash-cucumber/spec/resources.rb

@@ -33,7 +33,7 @@ def irbrc_path
   end
 
   def simulator_dylib
-    @sim_dylib_path ||= File.join(resources_dir, "libCalabashDynSim.dylib")
+    @sim_dylib_path ||= File.join(resources_dir, "libCalabashSim.dylib")
   end
 
   def app_bundle_path(bundle_name)