Skip to content

Commit

Permalink
Update Selenide up to 4.14.1 version. Add gradle auto build-scans. Up…
Browse files Browse the repository at this point in the history
…date gradle up to 4.10.1 and Kotlin up to 1.2.70
  • Loading branch information
daggerok committed Sep 18, 2018
1 parent 9a9b04f commit eba9f7d
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 35 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ before_install:
- sudo apt-get update -yqq >/dev/null
- sudo apt-get install -yqq --no-install-suggests --no-install-recommends yarn >/dev/null

- docker-compose build --pull
- docker-compose up -d
#- docker-compose build --pull
#- docker-compose up -d
- ./gradlew composeUp || echo nevermind

script:
- ./gradlew clean build -x test >/dev/null
Expand All @@ -66,6 +67,9 @@ script:
- ./gradlew -Dbrowser=chrome -Dremote=http://127.0.0.1:4444/wd/hub
- ./mvnw -DargLine="-Dbrowser=firefox -Dremote=http://127.0.0.1:4444/wd/hub"

after_script:
- ./gradlew composeDown || echo nevermind

before_deploy:
- cd ${root}
#
Expand Down
12 changes: 6 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ image::./logo.png[]

Status: in development:

- Latest release: 0.0.1
- Current version: 0.0.2
- Latest release: 0.0.2
- Current version: 0.0.3
- Feedback, suggestions any help or contributions are welcome!
== Usage (TODO)
Expand Down Expand Up @@ -88,9 +88,9 @@ image::https://www.bintray.com/docs/images/bintray_badge_color.png[Maven,align="
[source,gradle]
----
dependencies {
testImplementation 'com.github.daggerok:kotlenide:0.0.1'
testImplementation 'com.github.daggerok:kotlenide:0.0.2'
// Kotlenide also requires Selenide dependency:
testImplementation 'com.codeborne:selenide:4.14.0'
testImplementation 'com.codeborne:selenide:4.14.1'
}
----

Expand All @@ -104,14 +104,14 @@ image::http://maven.apache.org/images/maven-logo-black-on-white.png[Maven,align=
<dependency>
<groupId>com.github.daggerok</groupId>
<artifactId>kotlenide</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
<scope>test</scope>
</dependency>
<!-- Kotlenide also requires Selenide dependency: -->
<dependency>
<groupId>com.codeborne</groupId>
<artifactId>selenide</artifactId>
<version>4.14.0</version>
<version>4.14.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
31 changes: 19 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,46 +1,52 @@
buildscript {
ext {
kotlinVersion = '1.2.61'
selenideVersion = '4.14.0'
appVersion = '0.0.2'
appGroup = 'com.github.daggerok'
appDescription = 'Kotlin + Selenide is: ❤️ Kotlenide!'

kotlinVersion = '1.2.70'
selenideVersion = '4.14.1'

javaVersion = '1.8'
slf4jVersion = '1.7.25'
logbackVersion = '1.2.3'
junitJupiterVersion = '5.2.0'
junitPlatformVersion = '1.2.0'
asciidoctorjPdfVersion = '1.5.0-alpha.15'
assertkVersion = '0.12'
junitJupiterVersion = '5.3.1'
assertkJvmVersion = '0.12'
junit4Version = '4.12'

vcsUrl = 'https://github.com/daggerok/kotlenide.git'
}

dependencies {
classpath "org.asciidoctor:asciidoctorj-pdf:$asciidoctorjPdfVersion"
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
classpath 'org.jruby:jruby-complete:9.2.0.0'
}
}

plugins {
id 'idea'
id 'eclipse'
id 'com.avast.gradle.docker-compose' version '0.6.18'
id 'com.gradle.build-scan' version '1.16'
id 'com.avast.gradle.docker-compose' version '0.8.7'
id 'org.asciidoctor.convert' version '1.5.8.1' apply false
id 'org.ajoberstar.git-publish' version '0.3.0' apply false

id 'org.jetbrains.kotlin.jvm' version '1.2.61' apply false
id 'org.jetbrains.kotlin.plugin.noarg' version '1.2.61' apply false
id 'org.jetbrains.kotlin.plugin.allopen' version '1.2.61' apply false
id 'org.jetbrains.kotlin.jvm' version '1.2.70' apply false
id 'org.jetbrains.kotlin.plugin.noarg' version '1.2.70' apply false
id 'org.jetbrains.kotlin.plugin.allopen' version '1.2.70' apply false

id 'cn.bestwu.propdeps-eclipse' version '0.0.10' apply false
id 'cn.bestwu.propdeps-maven' version '0.0.10' apply false
id 'cn.bestwu.propdeps-idea' version '0.0.10' apply false
id 'cn.bestwu.propdeps' version '0.0.10' apply false

id 'com.jfrog.bintray' version '1.8.4' apply false

id "com.github.ben-manes.versions" version '0.20.0'
}

wrapper {
gradleVersion = '4.10'
gradleVersion = '4.10.1'
distributionType = 'BIN'
}

Expand All @@ -53,3 +59,4 @@ apply from: "$project.rootDir/gradle/junit.gradle"
apply from: "$project.rootDir/gradle/jacoco.gradle"
apply from: "$project.rootDir/gradle/findbugs.gradle"
apply from: "$project.rootDir/gradle/docs.gradle"
apply from: "$project.rootDir/gradle/build-scan.gradle"
15 changes: 15 additions & 0 deletions gradle/build-scan.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// read more: https://docs.gradle.com/build-scan-plugin/

buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
//// Always publish a build scan
//publishAlways()
// Publish a build scan only when the build fails:
publishOnFailure()
//// Publish a build scan if the given condition is true, regardless of whether the build succeeds or fails:
//publishAlwaysIf('TRAVIS' == System.getenv('CI'))
//// Publish a build scan only if the condition is true and the build fails:
//publishOnFailureIf('TRAVIS' == System.getenv('CI'))
tag System.getProperty('os.name', 'unknown')
}
6 changes: 3 additions & 3 deletions gradle/java.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
allprojects {
apply plugin: 'java'

version = '0.0.2'
group = 'com.github.daggerok'
description = 'Kotlin + Selenide is: ❤️ Kotlenide!'
group = project.appGroup
version = project.appVersion
description = project.appDescription
sourceCompatibility = targetCompatibility = "$javaVersion"

compileJava {
Expand Down
2 changes: 1 addition & 1 deletion gradle/kotlin.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ allprojects {

testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertkVersion"
testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertkJvmVersion"
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion kotlenide-examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ allprojects {

buildscript {
ext {
selenideVersion = '4.14.0'
selenideVersion = '4.14.1'
}
}

Expand Down
7 changes: 0 additions & 7 deletions kotlenide/README.adoc

This file was deleted.

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</modules>

<properties>
<kotlin.version>1.2.61</kotlin.version>
<selenide.version>4.14.0</selenide.version>
<kotlin.version>1.2.70</kotlin.version>
<selenide.version>4.14.1</selenide.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
Expand Down

0 comments on commit eba9f7d

Please sign in to comment.