Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
deskscreen
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kowis-projects
deskscreen
Commits
26c0e882
Commit
26c0e882
authored
Mar 24, 2019
by
David
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Latest gradle, and fix build warnings
parent
fa9def8a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
34 deletions
+11
-34
build.gradle
build.gradle
+4
-4
gradle/wrapper/gradle-wrapper.jar
gradle/wrapper/gradle-wrapper.jar
+0
-0
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
gradlew
gradlew
+1
-1
gradlew.bat
gradlew.bat
+1
-1
src/main/kotlin/is/kow/deskscreen/gpio/WiringPiComms.kt
src/main/kotlin/is/kow/deskscreen/gpio/WiringPiComms.kt
+3
-3
src/main/kotlin/is/kow/deskscreen/wx/WeatherController.kt
src/main/kotlin/is/kow/deskscreen/wx/WeatherController.kt
+1
-1
src/test/kotlin/is/kow/deskscreen/utils/DateTimeSpec.kt
src/test/kotlin/is/kow/deskscreen/utils/DateTimeSpec.kt
+0
-23
No files found.
build.gradle
View file @
26c0e882
...
...
@@ -9,8 +9,8 @@ buildscript {
plugins
{
id
'org.jetbrains.kotlin.jvm'
version
'1.3.21'
id
"io.spring.dependency-management"
version
"1.0.
1
.RELEASE"
id
'com.github.johnrengelman.shadow'
version
'
4.0.4
'
id
"io.spring.dependency-management"
version
"1.0.
7
.RELEASE"
id
'com.github.johnrengelman.shadow'
version
'
5.0.0
'
id
"org.hidetake.ssh"
version
"2.9.0"
id
"application"
}
...
...
@@ -60,6 +60,7 @@ shadowJar {
dependencies
{
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk8"
,
"org.jetbrains.kotlin:kotlin-reflect"
,
"no.tornado:tornadofx:1.7.16"
,
'io.reactivex.rxjava2:rxkotlin:2.2.0'
,
"com.github.thomasnield:rxkotlinfx:2.2.2"
,
...
...
@@ -99,8 +100,7 @@ dependencies {
// 'com.jcraft:jzlib:1.1.3'
testImplementation
"org.jetbrains.spek:spek-api:1.1.5"
,
"com.natpryce:hamkrest:1.4.2.2"
,
"org.jetbrains.kotlin:kotlin-reflect:1.2.60"
"com.natpryce:hamkrest:1.4.2.2"
testRuntime
"org.jetbrains.spek:spek-junit-platform-engine:1.1.5"
}
...
...
gradle/wrapper/gradle-wrapper.jar
View file @
26c0e882
No preview for this file type
gradle/wrapper/gradle-wrapper.properties
View file @
26c0e882
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-5.
2.1
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-5.
3
-all.zip
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
gradlew
View file @
26c0e882
...
...
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME
=
`
basename
"
$0
"
`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS
=
""
DEFAULT_JVM_OPTS
=
'"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD
=
"maximum"
...
...
gradlew.bat
View file @
26c0e882
...
...
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set
APP_HOME
=
%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set
DEFAULT_JVM_OPTS
=
set
DEFAULT_JVM_OPTS
=
"-Xmx64m"
@rem Find java.exe
if
defined
JAVA_HOME
goto
findJavaFromJavaHome
...
...
src/main/kotlin/is/kow/deskscreen/gpio/WiringPiComms.kt
View file @
26c0e882
...
...
@@ -107,9 +107,9 @@ class WiringPiComms {
*/
fun
getDht22Data
(
p
:
Int
):
DhtData
{
var
humidity
:
Double
=
0.0
var
celsius
:
Double
=
0.0
var
checksum
:
Int
=
0
var
humidity
=
0.0
var
celsius
=
0.0
var
checksum
=
0
Gpio
.
pinMode
(
p
,
Gpio
.
OUTPUT
)
...
...
src/main/kotlin/is/kow/deskscreen/wx/WeatherController.kt
View file @
26c0e882
...
...
@@ -327,7 +327,7 @@ class WeatherController : Controller() {
//Get the first three hours? or maybe all of them
val
tree
=
JsonPath
.
parse
(
response
.
body
.
stream
)
val
periods
:
List
<
Map
<
String
,
Object
>>
=
tree
.
read
(
"$.properties.periods[*]"
)
val
periods
:
List
<
Map
<
String
,
Any
>>
=
tree
.
read
(
"$.properties.periods[*]"
)
logger
.
debug
(
"Periods is: ${periods}"
)
val
parsedPeriods
:
List
<
HourForecast
>
=
periods
.
map
{
period
->
...
...
src/test/kotlin/is/kow/deskscreen/utils/DateTimeSpec.kt
deleted
100644 → 0
View file @
fa9def8a
package
`is`.kow.deskscreen.utils
import
org.jetbrains.spek.api.Spek
import
org.jetbrains.spek.api.dsl.given
import
org.jetbrains.spek.api.dsl.it
import
org.jetbrains.spek.api.dsl.on
import
java.time.OffsetDateTime
object
DateTimeSpec
:
Spek
({
given
(
"a date to parse"
)
{
on
(
"parsing"
)
{
val
text
=
"2018-09-21T14:37:28.000-0500"
it
(
"is parsed via jackson"
)
{
//OffsetDateTime.parse(text)
}
}
}
})
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment