Tidyup (#1)

* General tidy up. Moved to correct package.

* More clean ups:
Java verstion 8
Depenendy graph tidied up

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 sudo: true
-jdk: oraclejdk7
+jdk: oraclejdk8
 script: "./gradle/travisBuild.sh"
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

build.gradle

@@ -1,42 +1,29 @@
-
-buildscript {
-    ext.kotlin_version = '1.0.3'
-
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 plugins {
+    id 'nebula.kotlin' version '1.0.3'
     id 'nebula.project' version '3.3.0'
     id 'nebula.release' version '4.1.0'
     id 'nebula.maven-publish' version '4.9.1'
     id 'nebula.nebula-bintray' version '3.3.4'
 }
 
-apply plugin: 'kotlin'
-
 group 'au.com.console'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE'
+    compile 'org.springframework.data:spring-data-jpa:1.10.2.RELEASE'
+    compileOnly 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
+    testCompile 'org.springframework.boot:spring-boot-starter-data-jpa:1.3.5.RELEASE'
     testCompile 'com.h2database:h2:1.4.191'
     testCompile 'org.springframework.boot:spring-boot-starter-test:1.3.5.RELEASE'
     testCompile 'junit:junit:4.12'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = "3.0"
-}
-
 bintray {
     user = System.getenv('BINTRAY_USER')
     key = System.getenv('BINTRAY_KEY')
@@ -52,3 +39,7 @@ bintray {
         vcsUrl = "https://github.com/consoleau/${project.name}.git"
     }
 }
+
+task wrapper(type: Wrapper) {
+    gradleVersion = "3.0"
+}

gradle/travisBuild.sh

@@ -2,7 +2,7 @@
 # This script will build the project.
 # Based on https://github.com/nebula-plugins/nebula-kotlin-plugin/blob/master/gradle/buildViaTravis.sh
 
-SWITCHES="-x artifactoryPublish --info --stacktrace"
+SWITCHES="--info --stacktrace"
 
 GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2)
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 15 15:55:51 AEST 2016
+#Thu Sep 15 21:26:16 AEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

src/main/kotlin/com/console/data/jpaspecificationdsl/JPASpecificationDSL.kt → src/main/kotlin/au/com/console/jpaspecificationdsl/JPASpecificationDSL.kt

@@ -1,4 +1,4 @@
-package com.console.data.jpaspecificationsdsl
+package au.com.console.jpaspecificationdsl
 
 import org.springframework.data.jpa.domain.Specification
 import org.springframework.data.jpa.domain.Specifications

src/test/kotlin/com/console/data/jpaspecificationsdsl/JPASpecificationDSLTest.kt → src/test/kotlin/au/com/console/jpaspecificationdsl/JPASpecificationDSLTest.kt

@@ -1,10 +1,9 @@
-package com.console.data.jpaspecificationsdsl
+package au.com.console.jpaspecificationdsl
 
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
-import org.hamcrest.Matchers.*
+import org.hamcrest.Matchers.containsInAnyOrder
+import org.hamcrest.Matchers.equalTo
 import org.junit.After
-import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

src/test/kotlin/com/console/data/jpaspecificationsdsl/TvShowRepository.kt → src/test/kotlin/au/com/console/jpaspecificationdsl/TvShowRepository.kt

@@ -1,4 +1,4 @@
-package com.console.data.jpaspecificationsdsl
+package au.com.console.jpaspecificationdsl
 
 import org.springframework.data.jpa.domain.Specifications
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor