Skip to content

Commit

Permalink
remove aion_api from Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
aion-kelvin committed Feb 12, 2019
1 parent 56b3191 commit 6f20085
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
21 changes: 2 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ allprojects {

flatDir {
dirs './lib' // does not recurse, don't make subdirectories in here
<<<<<<< 92e6cf91cfbdd12f87e42993d2e956af3527ddc3
=======
}

maven {
url "${rootDir}/lib/maven_repo"
>>>>>>> Gradle build logic for publishing to arbitrary local Maven repo and consuming from one
}
}
}
Expand Down Expand Up @@ -254,9 +251,6 @@ build {
}

task prePack(type:Exec) {
dependsOn ':aion_api:cleanPack'
dependsOn ':aion_api:build'

if(findProject(":modGui") != null && gradle.useGui) {
dependsOn ':modGui:setupAionRootProject';
environment "useGui", "true"
Expand Down Expand Up @@ -319,7 +313,6 @@ task packDevDocker(type: Exec) {
}

clean {
dependsOn ':aion_api:clean'
dependsOn 'cleanJars'
delete dirPack
delete file('report')
Expand Down Expand Up @@ -370,7 +363,7 @@ task fixIdea {
// this task puts those files where IDEA expects them by running build and test

dependsOn build
configure(subprojects.findAll { it.name != 'aion_api' }) {
subprojects {
dependsOn test
}
}
Expand All @@ -390,13 +383,7 @@ def kernelVersionFromSrc() {
return version;
}

configure(subprojects.findAll { it.name != 'aion_api' }) {
// it makes the following harmless warning message, but that will not be a problem once aion_api
// is no longer a submodule:
//
// Configuration(s) specified but the install task does not exist in project :aion_api.
// Publication mavenPublication not found in project :aion_api.

subprojects {
apply plugin: 'maven-publish'
publishing {
publications {
Expand Down Expand Up @@ -455,9 +442,5 @@ configure(subprojects.findAll { it.name != 'aion_api' }) {
}
}

<<<<<<< 92e6cf91cfbdd12f87e42993d2e956af3527ddc3
} //publishing
=======
} //publishing
>>>>>>> Gradle build logic for publishing to arbitrary local Maven repo and consuming from one
}
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ include 'modAionBase', 'modAion', 'modAionImpl',
'modVM',
'modApiServer',
'aion_fastvm/modFastVM',
'aion_api',
'aion_vm_api',
'modBoot'

Expand Down

0 comments on commit 6f20085

Please sign in to comment.