Skip to content

Commit

Permalink
merged the develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
kazurayam committed Jun 19, 2020
2 parents 2bccd06 + 3482141 commit 8205d28
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,18 @@
.gradle
build/
tmp/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
/bin/
2 changes: 1 addition & 1 deletion VisualTestingInKatalonStudio.prj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<UUID>da342c35-8895-46a8-bc71-707f2266a118</UUID>
<migratedVersion>5.9.0</migratedVersion>
<pageLoadTimeout>0</pageLoadTimeout>
<projectFileLocation>/Users/kazuakiurayama/katalon-workspace/VisualTestingInKatalonStudio/VisualTestingInKatalonStudio.prj</projectFileLocation>
<projectFileLocation>C:\Users\qcq0264\katalon-workspace\VisualTestingInKatalonStudio\VisualTestingInKatalonStudio.prj</projectFileLocation>
<sourceContent>
<sourceFolderList>
<sourceFolderConfiguration>
Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// VisualTestingInKatalonStudio/build.gradle

apply plugin: 'groovy'

version = "1.17.3"
version = "1.17.4"

ext {
groovyVersion = '2.4.7'
Expand Down Expand Up @@ -41,7 +40,7 @@ task downloadJarsIntoDriversDir {
downloadFile('https://repo1.maven.org/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar')
downloadFile('https://github.com/kazurayam/junit4ks/releases/download/1.6/junit4ks-all.jar')
downloadFile('https://github.com/kazurayam/ksbackyard/releases/download/0.36.0/ksbackyard.jar')
downloadFile('https://github.com/kazurayam/Materials/releases/download/0.75.1/Materials-0.75.1.jar')
downloadFile('https://github.com/kazurayam/Materials/releases/download/0.75.2/Materials-0.75.2.jar')
}
}

Expand All @@ -53,7 +52,7 @@ task drivers {


task driversFromMavenLocal(type: Copy) {
from file("${System.getProperty('user.home')}/.m2/repository/com/kazurayam/Materials/0.72.0/Materials-0.72.0.jar")
from file("${System.getProperty('user.home')}/.m2/repository/com/kazurayam/Materials/0.75.2/Materials-0.75.2.jar")
into file("$projectDir/Drivers")
}

Expand Down

0 comments on commit 8205d28

Please sign in to comment.