这是indexloc提供的服务，不要输入任何密码
Skip to content

Update ProMotion dependency to current version #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update ProMotion dependency to current version #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc9cecc
This is supposed to be ignored
wndxlori Sep 21, 2020
b5c29c0
Updates for RubyMotion templates
wndxlori Sep 21, 2020
b89a804
Upgrade ProMotion dependency, and fix broken specs
wndxlori Sep 21, 2020
3e08dfb
Fix the Travis build
wndxlori Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
language: objective-c
osx_image: xcode12
env:
global:
- RUBYMOTION_LICENSE=1dcac45cc434293009f74b33037bdf7361a3a1ff # Official license key for open-source projects
- TMP_DIR=./tmp # For motion repo, so it doesn't attempt to use /tmp, to which it has no access
- OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
before_install:
- (ruby --version)
- sudo chown -R travis ~/Library/RubyMotion
- mkdir -p ~/Library/RubyMotion/build
- sudo motion update
gemfile:
- Gemfile
script:
- bundle install
- bundle exec rake clean
- bundle exec rake spec
- brew update
- brew outdated xctool || brew upgrade xctool
- (xcrun simctl list)
- wget http://travisci.rubymotion.com/ -O RubyMotion-TravisCI.pkg
- sudo installer -pkg RubyMotion-TravisCI.pkg -target /
- cp -r /usr/lib/swift/*.dylib /Applications/Xcode.app/Contents/Frameworks/
- touch /Applications/Xcode.app/Contents/Frameworks/.swift-5-staged
- sudo mkdir -p ~/Library/RubyMotion/build
- sudo chown -R travis ~/Library/RubyMotion
- eval "sudo motion activate $RUBYMOTION_LICENSE"
- sudo motion update
- (motion --version)
- (ruby --version)
- motion repo
script: bundle exec rake spec
30 changes: 0 additions & 30 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ProMotion-map.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |spec|
spec.name = "ProMotion-map"
spec.version = "0.7.0"
spec.version = "0.8.0"
spec.authors = ["Mark Rickert", "Jamon Holmgren"]
spec.email = ["mark@mohawkapps.com", "jamon@clearsightstudio.com"]
spec.description = %q{Adds PM::MapScreen support to ProMotion.}
Expand All @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(spec)/})
spec.require_paths = ["lib"]

spec.add_dependency "ProMotion", "~> 2.0"
spec.add_dependency "ProMotion", "~> 3.0"
spec.add_development_dependency "motion-stump", "~> 0.3"
spec.add_development_dependency "motion-redgreen", "~> 0.1"
spec.add_development_dependency "rake"
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
$:.unshift("/Library/RubyMotion/lib")
$:.unshift("~/.rubymotion/rubymotion-templates") # Add this line
require 'motion/project/template/ios'

require 'bundler'
Bundler.require(:development)
require 'ProMotion'
Expand All @@ -10,6 +12,4 @@ Motion::Project::App.setup do |app|
# Use `rake config' to see complete project settings.
app.name = 'ProMotion-map'

# app.sdk_version = "8.1"
# app.deployment_target = '7.1'
end
14 changes: 7 additions & 7 deletions spec/func_map_screen_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ def add_image_annotation
end

it "should select an annotation" do
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation map_screen.annotations.first
wait 0.75 do
map_screen.selected_annotations.count.should == 1
end
end

it "should select an annotation by index" do
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation_at 2
wait 0.75 do
map_screen.selected_annotations.count.should == 1
Expand All @@ -69,7 +69,7 @@ def add_image_annotation
end

it "should select another annotation and check that the title is correct" do
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation map_screen.annotations[1]
wait 0.75 do
map_screen.selected_annotations.count.should == 1
Expand All @@ -88,7 +88,7 @@ def add_image_annotation

map_screen.deselect_annotations
wait 0.75 do
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
end
end

Expand Down Expand Up @@ -136,7 +136,7 @@ def add_image_annotation

it "should select an image annotation" do
add_image_annotation
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation map_screen.annotations.last
wait 0.75 do
map_screen.selected_annotations.count.should == 1
Expand All @@ -145,7 +145,7 @@ def add_image_annotation

it "should select an image annotation by index" do
add_image_annotation
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation_at 5
wait 0.75 do
map_screen.selected_annotations.count.should == 1
Expand All @@ -155,7 +155,7 @@ def add_image_annotation

it "should select an image annotation and check that the title is correct" do
add_image_annotation
map_screen.selected_annotations.should == nil
map_screen.selected_annotations.should == []
map_screen.select_annotation map_screen.annotations[5]
wait 0.75 do
map_screen.selected_annotations.count.should == 1
Expand Down