Skip to content

Commit dbb443a

Browse files
JonahssJonahss
committed
Merge pull request #116 from Jonahss/master
v2.0.0
2 parents d4bf1e1 + f7687da commit dbb443a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2021
-992
lines changed

‎README.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ Depends upon the Selenium Java client library, available [here](http://docs.sele
1111
<dependency>
1212
<groupId>io.appium</groupId>
1313
<artifactId>java-client</artifactId>
14-
<version>1.7.0</version>
14+
<version>2.0.0</version>
1515
</dependency>
1616
```
1717

1818
Javadocs: http://appium.github.io/java-client/
1919

20+
###Structure###
21+
22+
There is an abstract _AppiumDriver_ class which inherits from the Selenium Java Client.
23+
The _AppiumDriver_ class contains all methods shared by iOS and Android.
24+
_IOSDriver_ and _AndroidDriver_ both extend _AppiumDriver_ and provide more methods, and specific implementations for some methods.
25+
2026
###Added functions###
2127
More can be found in the docs, but here's a quick list of features which this project has added to the usual selenium binding.
2228

@@ -64,6 +70,11 @@ Locators:
6470
- findElementsByAndroidUIAutomator()
6571

6672
##Changelog##
73+
*2.0.0*
74+
- AppiumDriver is now an abstract class, use IOSDriver and AndroidDriver which both extend it. You no longer need to include the `PLATFORM_NAME` desired capability since it's automatic for each class. Thanks to @TikhomirovSergey for all their work
75+
- ScrollTo() and ScrollToExact() methods reimplemented
76+
- Zoom() and Pinch() are now a little smarter and less likely to fail if you element is near the edge of the screen. Congratulate @BJap on their first PR!
77+
6778
*1.7.0*
6879
- Removed `scrollTo()` and `scrollToExact()` methods because they relied on `complexFind()`. They will be added back in the next version!
6980
- Removed `complexFind()`

‎java-client.iml

+21-62
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<orderEntry type="library" name="commons-lang-2.4" level="project" />
2020
<orderEntry type="library" name="commons-codec-1.9" level="project" />
2121
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
22-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.42.2" level="project" />
23-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.42.2" level="project" />
24-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.42.2" level="project" />
22+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.43.1" level="project" />
23+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.43.1" level="project" />
24+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.43.1" level="project" />
2525
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
2626
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
27-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.42.2" level="project" />
27+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.43.1" level="project" />
2828
<orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
2929
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
3030
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
@@ -33,71 +33,30 @@
3333
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
3434
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
3535
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
36-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.42.2" level="project" />
37-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.14" level="project" />
36+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.43.1" level="project" />
37+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.15" level="project" />
3838
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
3939
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
4040
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
4141
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
42-
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
43-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.2" level="project" />
44-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.14" level="project" />
42+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
43+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.3" level="project" />
44+
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.15" level="project" />
4545
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
46-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
47-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.13" level="project" />
46+
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.21" level="project" />
47+
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.14" level="project" />
4848
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
4949
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
50-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.14.v20131031" level="project" />
51-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.14.v20131031" level="project" />
52-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.14.v20131031" level="project" />
53-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.14.v20131031" level="project" />
54-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.42.2" level="project" />
55-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.42.2" level="project" />
56-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.42.2" level="project" />
57-
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
58-
<orderEntry type="library" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
59-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.42.2" level="project" />
60-
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
61-
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
62-
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
63-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-java:2.42.2" level="project" />
64-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.42.2" level="project" />
65-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.42.2" level="project" />
66-
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
67-
<orderEntry type="library" name="Maven: org.json:json:20080701" level="project" />
68-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-api:2.42.2" level="project" />
69-
<orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
70-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.3" level="project" />
71-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
72-
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
73-
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
74-
<orderEntry type="library" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
75-
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
76-
<orderEntry type="library" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
77-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-htmlunit-driver:2.42.2" level="project" />
78-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.14" level="project" />
79-
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
80-
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
81-
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
82-
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
83-
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
84-
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.3.2" level="project" />
85-
<orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.14" level="project" />
86-
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
87-
<orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
88-
<orderEntry type="library" name="Maven: net.sourceforge.cssparser:cssparser:0.9.13" level="project" />
89-
<orderEntry type="library" name="Maven: org.w3c.css:sac:1.3" level="project" />
90-
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
91-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.14.v20131031" level="project" />
92-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.14.v20131031" level="project" />
93-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.14.v20131031" level="project" />
94-
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.14.v20131031" level="project" />
95-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.42.2" level="project" />
96-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.42.2" level="project" />
97-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.42.2" level="project" />
98-
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
99-
<orderEntry type="library" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
100-
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.42.2" level="project" />
50+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.1.15.v20140411" level="project" />
51+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:8.1.15.v20140411" level="project" />
52+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:8.1.15.v20140411" level="project" />
53+
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:8.1.15.v20140411" level="project" />
54+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.43.1" level="project" />
55+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.43.1" level="project" />
56+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-safari-driver:2.43.1" level="project" />
57+
<orderEntry type="library" name="Maven: org.webbitserver:webbit:0.4.15" level="project" />
58+
<orderEntry type="library" name="Maven: io.netty:netty:3.5.5.Final" level="project" />
59+
<orderEntry type="library" name="Maven: org.seleniumhq.selenium:selenium-support:2.43.1" level="project" />
10160
<orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
10261
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
10362
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />

‎pom.xml

+17-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>io.appium</groupId>
77
<artifactId>java-client</artifactId>
8-
<version>1.7.0</version>
8+
<version>2.0.0</version>
99
<dependencies>
1010
<dependency>
1111
<groupId>com.google.code.gson</groupId>
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>org.seleniumhq.selenium</groupId>
1717
<artifactId>selenium-java</artifactId>
18-
<version>2.42.2</version>
18+
<version>2.43.1</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>junit</groupId>
@@ -37,7 +37,21 @@
3737
<artifactId>cglib</artifactId>
3838
<version>3.1</version>
3939
</dependency>
40-
40+
<dependency>
41+
<groupId>org.reflections</groupId>
42+
<artifactId>reflections</artifactId>
43+
<version>0.9.8</version>
44+
<exclusions>
45+
<exclusion>
46+
<artifactId>guava</artifactId>
47+
<groupId>com.google.guava</groupId>
48+
</exclusion>
49+
<exclusion>
50+
<artifactId>xml-apis</artifactId>
51+
<groupId>xml-apis</groupId>
52+
</exclusion>
53+
</exclusions>
54+
</dependency>
4155
</dependencies>
4256
<packaging>jar</packaging>
4357
<name>java-client</name>

0 commit comments

Comments
 (0)