diff --git a/.gitmodules b/.gitmodules index 80633158b1..71d8a40837 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = aion_fastvm url = https://github.com/aionnetwork/aion_fastvm branch = master -[submodule "aion_api"] - path = aion_api - url = https://github.com/aionnetwork/aion_api - branch = master [submodule "aion_gui"] path = aion_gui url = https://github.com/aionnetwork/aion_gui diff --git a/aion_api b/aion_api deleted file mode 160000 index 29607583e7..0000000000 --- a/aion_api +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 29607583e78b7327fff9dfacce056bced540f677 diff --git a/build.gradle b/build.gradle index b08dfd4f0f..e5ea11cf41 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,10 @@ allprojects { flatDir { dirs './lib' // does not recurse, don't make subdirectories in here } + + maven { + url "${rootDir}/lib/maven_repo" + } } } @@ -247,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" @@ -312,7 +313,6 @@ task packDevDocker(type: Exec) { } clean { - dependsOn ':aion_api:clean' dependsOn 'cleanJars' delete dirPack delete file('report') @@ -363,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 } } @@ -383,30 +383,22 @@ 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. - - apply plugin: 'maven-publish' - publishing { - publications { - mavenJava(MavenPublication) { - groupId = 'network.aion' - - afterEvaluate { - artifactId = project.hasProperty('mavenPubArtifactId') - ? mavenPubArtifactId - : project.name - version = project.hasProperty('mavenPubVersion') - ? mavenPubVersion - : kernelVersionFromSrc(); - } - from components.java - } - } +subprojects { + apply plugin: 'maven-publish' + publishing { + publications { + mavenJava(MavenPublication) { + groupId = 'network.aion' + artifactId = project.hasProperty('mavenPubArtifactId') + ? mavenPubArtifactId + : project.name + version = project.hasProperty('mavenPubVersion') + ? mavenPubVersion + : kernelVersionFromSrc(); + + from components.java + } + } repositories { maven { @@ -450,5 +442,5 @@ configure(subprojects.findAll { it.name != 'aion_api' }) { } } - } //publishing + } //publishing } diff --git a/settings.gradle b/settings.gradle index 1c0246943f..14bc4395cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,6 @@ include 'modAionBase', 'modAion', 'modAionImpl', 'modVM', 'modApiServer', 'aion_fastvm/modFastVM', - 'aion_api', 'aion_vm_api', 'modBoot'