Basic gradle cleanup; Semantics did not change

Luxoft · Aug 7, 2018 · 9a718d8 · 9a718d8
1 parent b51f570
commit 9a718d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,6 @@ buildscript {
     ext.kotlin_version = '1.2.30'
 
     repositories {
-        mavenLocal()
-        mavenCentral()
         jcenter()
     }
 
@@ -55,6 +53,10 @@ allprojects {
         testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
         testCompile "junit:junit:$junit_version"
     }
+
+    compileKotlin.kotlinOptions.jvmTarget = "1.8"
+    compileTestKotlin.kotlinOptions.jvmTarget = "1.8"
+    sourceCompatibility = 1.8
 }
 
 dependencies {
@@ -64,7 +66,6 @@ dependencies {
     cordapp project(":cordapp-contracts-states")
 }
 
-sourceCompatibility = 1.8
 
 task deployNodes(type: net.corda.plugins.Cordform) { //, dependsOn: ['shadowJar']) {
     directory "./build/nodes"
@@ -146,11 +147,4 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         jvmTarget = "1.8"
         javaParameters = true   // Useful for reflection.
     }
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/cordapp-contracts-states/build.gradle b/cordapp-contracts-states/build.gradle
@@ -1,13 +1,8 @@
 group 'com.luxoft.blockchainlab.corda.hyperledger.indy'
 
-sourceCompatibility = 1.8
-
 apply plugin: 'net.corda.plugins.cordapp'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-
     cordaCompile "${corda_release_group}:corda-core:${corda_release_version}"
     cordaCompile "${corda_release_group}:corda-rpc:${corda_release_version}"
     cordaCompile "${corda_release_group}:corda-node-api:${corda_release_version}"
@@ -31,11 +26,4 @@ publishing {
             from components.java
         }
     }
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/cordapp/build.gradle b/cordapp/build.gradle
@@ -1,13 +1,8 @@
 group 'com.luxoft.blockchainlab.corda.hyperledger.indy'
 
-sourceCompatibility = 1.8
-
 apply plugin: 'net.corda.plugins.cordapp'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-
     cordaCompile "${corda_release_group}:corda-core:${corda_release_version}"
     cordaCompile "${corda_release_group}:corda-rpc:${corda_release_version}"
     cordaCompile "${corda_release_group}:corda-node-api:${corda_release_version}"
@@ -32,11 +27,4 @@ publishing {
             from components.java
         }
     }
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/indy-utils/build.gradle b/indy-utils/build.gradle
@@ -1,39 +1,23 @@
-buildscript {
-    ext.indy_version = "1.5.0"
-
-    repositories {
-        mavenCentral()
-        maven { url 'https://repo.evernym.com/artifactory/libindy-maven-local' }
-    }
-}
-
 plugins {
     id 'com.palantir.docker-run' version '0.19.2'
 }
 
-//apply plugin: 'kotlin'
+ext.indy_version = "1.5.0"
 
 repositories {
-    mavenCentral()
-    mavenLocal()
     maven {
         url 'https://repo.evernym.com/artifactory/libindy-maven-local'
     }
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
     compile group: 'org.hyperledger', name: 'indy', version: "$indy_version"
     compile "$corda_release_group:corda-core:$corda_release_version"
 
     compile group: 'org.json', name: 'json', version: '20160212'
     //compile group: 'commons-io', name: 'commons-io', version: '2.6'
 
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
-
-    testCompile "junit:junit:$junit_version"
 }
 
 dockerRun {
@@ -43,14 +27,7 @@ dockerRun {
     daemonize true
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
 task cleanDefaultPool(type: Delete) {
     def home = System.getProperty("user.home")
-    delete "$home/.indy_client/"
+    delete("$home/.indy_client/")
 }