Skip to content

Commit

Permalink
[java] Merging IDEA modules 'client' and 'server' into a single 'java…
Browse files Browse the repository at this point in the history 
…' module
  • Loading branch information
@barancev
barancev committed Jan 8, 2020
1 parent 5d0099d commit d1cf684
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 59 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ maven-metadata-.xml
maven-metadata-.xml.sha1
node_modules/
resolver-status.properties
java/build/
java/client/build/
java/client/log.txt
java/client/iedriver.log
Expand Down
5 changes: 2 additions & 3 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/client/test/org/openqa/selenium/testing/StaticResources.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static void ensureAvailable() {
private static void copy(String copyFrom, String copyTo) {
try {
Path source = InProject.locate("bazel-bin").resolve(copyFrom);
Path dest = InProject.locate("java/client/build/test").resolve(copyTo);
Path dest = InProject.locate("java/build/test").resolve(copyTo);

if (Files.exists(dest)) {
// Assume we're good.
Expand Down
14 changes: 9 additions & 5 deletions java/client/client.iml → java/java.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
<output url="file://$MODULE_DIR$/build/production" />
<output-test url="file://$MODULE_DIR$/build/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<content url="file://$MODULE_DIR$/client">
<sourceFolder url="file://$MODULE_DIR$/client/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/client/test" isTestSource="true" />
</content>
<content url="file://$MODULE_DIR$/../../third_party/js/sizzle">
<sourceFolder url="file://$MODULE_DIR$/../../third_party/js/sizzle" type="java-resource" />
<content url="file://$MODULE_DIR$/server">
<sourceFolder url="file://$MODULE_DIR$/server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/server/test" isTestSource="true" />
</content>
<content url="file://$MODULE_DIR$/../third_party/js/sizzle">
<sourceFolder url="file://$MODULE_DIR$/../third_party/js/sizzle" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down
23 changes: 0 additions & 23 deletions java/server/server.iml
View file

This file was deleted.

27 changes: 0 additions & 27 deletions rb/ruby.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,6 @@
</content>
<orderEntry type="jdk" jdkName="ruby-2.5.1-p57" jdkType="RUBY_SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.2, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ast (v2.3.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.4, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="childprocess (v0.9.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.25, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v0.3.7, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.12.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="parser (v2.4.0.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v2.0.5, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v1.6.11, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.2, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v12.1.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.50.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.9.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.2, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.3.0, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="webmock (v2.3.2, ruby-2.5.1-p57) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.12, ruby-2.5.1-p57) [gem]" level="application" />
</component>
<component name="sonarModuleSettings">
<option name="alternativeWorkingDirPath" value="" />
Expand Down

0 comments on commit d1cf684

Please sign in to comment.