Merge branch 'master' into selenium-12141

appium · Sep 4, 2023 · 96cfa03 · 96cfa03
2 parents 3499f13 + d58652c
commit 96cfa03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/appium_lib_core.gemspec b/appium_lib_core.gemspec
@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '~> 0.9.11'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
-  spec.add_development_dependency 'webmock', '~> 3.18.1'
-  spec.add_development_dependency 'rubocop', '1.56.1'
+  spec.add_development_dependency 'webmock', '~> 3.19.0'
+  spec.add_development_dependency 'rubocop', '1.56.2'
   spec.add_development_dependency 'appium_thor', '~> 1.0'
   spec.add_development_dependency 'parallel_tests'
   spec.add_development_dependency 'simplecov'

diff --git a/ci-jobs/functional_test.yml b/ci-jobs/functional_test.yml
@@ -5,7 +5,7 @@ parameters:
   xcodeForIOS: 14.2
   xcodeForTVOS: 14.2
   androidSDK: 29  # API Level 30 emulators are more unstable than 29
-  appiumVersion: 'next'  # for appium 2 upstream
+  appiumVersion: '2'  # for appium 2 upstream
   ignoreVersionSkip: true
   CI: true