File tree Expand file tree Collapse file tree 7 files changed +42
-16
lines changed Expand file tree Collapse file tree 7 files changed +42
-16
lines changed Original file line number Diff line number Diff line change 11.gradle /
2+ .idea /
3+ kotlin /sample /build /
4+ kotlin /library /build /
5+ kotlin /build /
Original file line number Diff line number Diff line change @@ -13,13 +13,16 @@ buildscript {
1313 }
1414}
1515
16+ apply plugin : " idea"
17+ apply plugin : " java"
18+ apply plugin : " kotlin"
19+ apply plugin : " application"
20+
1621allprojects {
1722 repositories {
1823 mavenCentral()
1924 jcenter()
2025 }
2126}
2227
23- task clean (type : Delete ) {
24- delete rootProject. buildDir
25- }
28+ mainClassName = " vacuumanalytics.LogEventKt"
Original file line number Diff line number Diff line change @@ -17,12 +17,8 @@ apply plugin: "idea"
1717apply plugin : " java"
1818apply plugin : " kotlin"
1919apply plugin : " application"
20- /*
21- sourceSets {
22- main.java.srcDirs += ''
23- }*/
2420
25- mainClassName = " LogEvent "
21+ mainClassName = " vacuumanalytics.LogEventKt "
2622
2723repositories {
2824 mavenCentral()
@@ -36,10 +32,26 @@ dependencies {
3632 compile ' com.github.kittinunf.fuel:fuel:1.11.0'
3733}
3834
35+ repositories {
36+ mavenCentral()
37+ jcenter()
38+ flatDir {
39+ dirs ' libs'
40+ }
41+ }
42+
43+ // Include dependent libraries in archive.
3944jar {
4045 manifest {
41- attributes " Main-Class" : " vacuumanalytics.$mainClassName "
46+ attributes " Main-Class" : " $mainClassName "
47+ }
48+ from {
49+ configurations. compile. collect { it. isDirectory() ? it : zipTree(it) }
50+ } {
51+ exclude " META-INF/*.SF"
52+ exclude " META-INF/*.DSA"
53+ exclude " META-INF/*.RSA"
4254 }
4355
44- baseName ' vacuum-analytics '
56+ baseName ' library '
4557}
File renamed without changes.
Original file line number Diff line number Diff line change @@ -13,8 +13,11 @@ buildscript {
1313 }
1414}
1515
16+ apply plugin : " idea"
1617apply plugin : " java"
1718apply plugin : " kotlin"
19+ apply plugin : " application"
20+
1821sourceSets {
1922 main. java. srcDirs + = ' src/main/'
2023}
@@ -30,16 +33,20 @@ dependencies {
3033 /* compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"*/
3134}
3235
33- compileKotlin {
34- kotlinOptions. jvmTarget = " 1.8"
35- }
36+ mainClassName = " sample.MainKt"
3637
3738jar {
3839 manifest {
39- attributes " Main-Class" : " sample.MainKt "
40+ attributes " Main-Class" : " $m ainClassName "
4041 }
4142
42- from { configurations. compile. collect { it. isDirectory() ? it : zipTree(it) } }
43+ from {
44+ configurations. compile. collect { it. isDirectory() ? it : zipTree(it) }
45+ } {
46+ exclude " META-INF/*.SF"
47+ exclude " META-INF/*.DSA"
48+ exclude " META-INF/*.RSA"
49+ }
4350
4451 baseName ' sample'
4552}
File renamed without changes.
Original file line number Diff line number Diff line change 1- include ' : library' , ' : sample'
1+ include ' library' , ' sample'
You can’t perform that action at this time.
0 commit comments