Merge pull request #821 from aionnetwork/no-aion-api

Remove aion_api submodule
aionnetwork · Feb 14, 2019 · 67b564d · 67b564d
2 parents 1930df5 + 89ed380
commit 67b564d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 36 deletions.
diff --git 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
diff --git 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
@@ -13,7 +13,6 @@ include 'modAionBase', 'modAion', 'modAionImpl',
     'modVM',
     'modApiServer',
     'aion_fastvm/modFastVM',
-    'aion_api',
     'aion_vm_api',
     'modBoot'