Skip to content

Commit

Permalink
Updated gradle scripts (#3871)
Browse files Browse the repository at this point in the history
Includes #3819
  • Loading branch information
yueh authored Dec 23, 2018
1 parent 524b26d commit ed64378
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 17 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aeversion=rv5
aeversion=rv6
aechannel=alpha
aebuild=0
aegroup=appeng
Expand Down
40 changes: 24 additions & 16 deletions gradle/scripts/artifacts.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,44 @@ allprojects {
}

javadoc {
options.encoding = 'UTF-8'
options.charSet = 'UTF-8'
options.encoding = 'UTF-8'
options.charSet = 'UTF-8'
}

task javadocs(type: Javadoc) {
source = sourceSets.api.java
include "appeng/api/**"
source = sourceSets.api.java
include "appeng/api/**"

// Due to ForgeGradle having to be a special snowflake,
// we have to add some custom configurations to the normal compile configuration and hope it does not break.
classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps
// Due to ForgeGradle having to be a special snowflake,
// we have to add some custom configurations to the normal compile configuration and hope it does not break.
classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps
}

task javadocJar(type: Jar, dependsOn: javadocs) {
from javadoc.destinationDir
classifier = 'javadoc'

classifier = 'javadoc'
}

task apiJar(type: Jar) {
from sourceSets.api.java
include "appeng/api/**"
from sourceSets.api.java
include "appeng/api/**"

from sourceSets.api.output
include "appeng/api/**"

classifier = 'api'
}

from sourceSets.api.output
include "appeng/api/**"
task sourceJar(type: Jar, overwrite: true) {
from sourceSets.api.allSource
from sourceSets.main.allSource

classifier = 'api'
classifier = 'sources'
}

artifacts {
archives apiJar
archives javadocJar
archives sourceJar
archives apiJar
archives javadocJar
archives sourceJar
}

0 comments on commit ed64378

Please sign in to comment.