Skip to content
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.

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

Update to Ruby 3 #10

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ limitations under the License.
<!-- The generator runs in a CDI environment, implemented by Weld: -->
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se</artifactId>
<version>2.3.0.Final</version>
<artifactId>weld-se-core</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we change to weld-se-shaded?

<version>3.1.9.Final</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down
20 changes: 19 additions & 1 deletion sdk/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Style/DateTime:
# to itself. Rubocop doesn't like these tests, but we want them anyhow,
# so we exclude that spec.
#
Lint/UselessComparison:
Lint/BinaryOperatorWithIdenticalOperands:
Exclude:
- 'spec/type_spec.rb'
Style/NilComparison:
Expand All @@ -95,3 +95,21 @@ AllCops:
- 'lib/ovirtsdk4/version.rb'
- 'pkg/**/*'
- 'tmp/**/*'

#
# This things used to work fine before upgrading Rubocop, and we don't want
# to address them now. At some point we should remove these lines, check the
# result and fix the code accordingly.
#
Style/RedundantFileExtensionInRequire:
Enabled: False
Style/OptionalBooleanParameter:
Enabled: False
Naming/VariableNumber:
Enabled: False
Style/AccessorGrouping:
Enabled: False
Style/SingleArgumentDig:
Enabled: False
Style/ZeroLengthPredicate:
Enabled: False
2 changes: 1 addition & 1 deletion sdk/examples/vm_backup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
system_service = connection.system_service

# Get the reference to the service that we will use to send events to the audit log:
events_service = system_service.events_service()
events_service = system_service.events_service

# In order to send events we need to also send unique integer ids. These should usually come from an external
# database, but in this example we # will just generate them from the current time in seconds since Jan 1st 1970.
Expand Down
7 changes: 4 additions & 3 deletions sdk/ovirt-engine-sdk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.5'

# Build time dependencies:
spec.add_development_dependency('rake', '~> 12.3')
spec.add_development_dependency('rake-compiler', '~> 1.0')
spec.add_development_dependency('rake', '~> 13.1')
spec.add_development_dependency('rake-compiler', '~> 1.2')
spec.add_development_dependency('rspec', '~> 3.7')
spec.add_development_dependency('rubocop', '0.79.0')
spec.add_development_dependency('rubocop', '1.60.2')
spec.add_development_dependency('webrick', '~> 1.8')
spec.add_development_dependency('yard', '~> 0.9', '>= 0.9.12')

# Run time dependencies:
Expand Down
Loading