Reorder tasks for build

Author: ZachChuba

build.gradle

@@ -18,7 +18,6 @@ plugins {
 }
 
 apply from: "$rootDir/gradle/ci-support.gradle"
-apply from: "$rootDir/gradle/publishing.gradle"
 apply plugin: 'com.github.tjni.captainhook'
 
 captainHook {
@@ -140,3 +139,4 @@ subprojects {
         configFile = rootProject.file('config/checkstyle/checkstyle.xml')
     }
 }
+apply from: "$rootDir/gradle/publishing.gradle"

gradle/publishing.gradle

@@ -1,95 +1,97 @@
 apply plugin: 'maven-publish'
 
-task sourceJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from sourceSets.main.allJava
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from javadoc
-}
-
-jar.archiveClassifier.set("original")
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) { publication ->
-            artifactId = project.name
-            artifact sourceJar
-            artifact javadocJar
-
-            artifact project.tasks.jar
-            artifacts.removeAll { it.classifier == jar.archiveClassifier.get() }
-            artifact project.tasks.shadowJar
+afterEvaluate {
+    task sourceJar(type: Jar) {
+        archiveClassifier.set('sources')
+        from sourceSets.main.allJava
+    }
 
-            pom.withXml {
-                def rootNode = asNode()
-                rootNode.children().last() + {
-                    resolveStrategy = Closure.DELEGATE_FIRST
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        archiveClassifier.set('javadoc')
+        from javadoc
+    }
 
-                    name project.description
-                    description 'Isolated container management for Java code testing'
-                    url 'https://java.testcontainers.org'
-                    issueManagement {
-                        system 'GitHub'
-                        url 'https://github.com/testcontainers/testcontainers-java/issues'
-                    }
-                    licenses {
-                        license {
-                            name 'MIT'
-                            url 'http://opensource.org/licenses/MIT'
+    jar.archiveClassifier.set("original")
+
+    publishing {
+        publications {
+            mavenJava(MavenPublication) { publication ->
+                artifactId = project.name
+                artifact sourceJar
+                artifact javadocJar
+
+                artifact project.tasks.jar
+                artifacts.removeAll { it.classifier == jar.archiveClassifier.get() }
+                artifact project.tasks.shadowJar
+
+                pom.withXml {
+                    def rootNode = asNode()
+                    rootNode.children().last() + {
+                        resolveStrategy = Closure.DELEGATE_FIRST
+
+                        name project.description
+                        description 'Isolated container management for Java code testing'
+                        url 'https://java.testcontainers.org'
+                        issueManagement {
+                            system 'GitHub'
+                            url 'https://github.com/testcontainers/testcontainers-java/issues'
                         }
-                    }
-                    scm {
-                        url 'https://github.com/testcontainers/testcontainers-java/'
-                        connection 'scm:git:git://github.com/testcontainers/testcontainers-java.git'
-                        developerConnection 'scm:git:ssh://[email protected]/testcontainers/testcontainers-java.git'
-                    }
-                    developers {
-                        developer {
-                            id 'rnorth'
-                            name 'Richard North'
-                            email '[email protected]'
+                        licenses {
+                            license {
+                                name 'MIT'
+                                url 'http://opensource.org/licenses/MIT'
+                            }
+                        }
+                        scm {
+                            url 'https://github.com/testcontainers/testcontainers-java/'
+                            connection 'scm:git:git://github.com/testcontainers/testcontainers-java.git'
+                            developerConnection 'scm:git:ssh://[email protected]/testcontainers/testcontainers-java.git'
+                        }
+                        developers {
+                            developer {
+                                id 'rnorth'
+                                name 'Richard North'
+                                email '[email protected]'
+                            }
                         }
                     }
-                }
 
-                def dependenciesNode = rootNode.appendNode('dependencies')
+                    def dependenciesNode = rootNode.appendNode('dependencies')
 
-                def apiDeps = project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies
-                def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies
-                def newApiDeps = apiDeps - providedDeps
+                    def apiDeps = project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies
+                    def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies
+                    def newApiDeps = apiDeps - providedDeps
 
-                def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->
-                    for (dependency in resolvedDependencies) {
-                        if (dependency.configuration.startsWith("platform-")) {
-                            continue
-                        }
-                        dependenciesNode.appendNode('dependency').with {
-                            if (!dependency.moduleGroup || !dependency.moduleName || !dependency.moduleVersion) {
-                                throw new IllegalStateException("Wrong dependency: $dependency")
+                    def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->
+                        for (dependency in resolvedDependencies) {
+                            if (dependency.configuration.startsWith("platform-")) {
+                                continue
                             }
+                            dependenciesNode.appendNode('dependency').with {
+                                if (!dependency.moduleGroup || !dependency.moduleName || !dependency.moduleVersion) {
+                                    throw new IllegalStateException("Wrong dependency: $dependency")
+                                }
 
-                            appendNode('groupId', dependency.moduleGroup)
-                            appendNode('artifactId', dependency.moduleName)
-                            appendNode('version', dependency.moduleVersion)
-                            appendNode('scope', scope)
-
-                            if (dependency instanceof ModuleDependency && !dependency.excludeRules.empty) {
-                                def excludesNode = appendNode('exclusions')
-                                for (rule in dependency.excludeRules) {
-                                    excludesNode.appendNode('exclusion').with {
-                                        appendNode('groupId', rule.group)
-                                        appendNode('artifactId', rule.module)
+                                appendNode('groupId', dependency.moduleGroup)
+                                appendNode('artifactId', dependency.moduleName)
+                                appendNode('version', dependency.moduleVersion)
+                                appendNode('scope', scope)
+
+                                if (dependency instanceof ModuleDependency && !dependency.excludeRules.empty) {
+                                    def excludesNode = appendNode('exclusions')
+                                    for (rule in dependency.excludeRules) {
+                                        excludesNode.appendNode('exclusion').with {
+                                            appendNode('groupId', rule.group)
+                                            appendNode('artifactId', rule.module)
+                                        }
                                     }
                                 }
                             }
                         }
                     }
+                    addDependencies(newApiDeps, 'compile')
+                    addDependencies(providedDeps, 'provided')
                 }
-                addDependencies(newApiDeps, 'compile')
-                addDependencies(providedDeps, 'provided')
             }
         }
     }
@@ -107,8 +109,6 @@ publishing {
 // Ensure the POM file is generated during the build process
 tasks.build {
     dependsOn publishing.publications.mavenJava.publishableFiles
-    dependsOn sourceJar
-    dependsOn javadocJar
 }
 /*
 
@@ -221,4 +221,4 @@ publishing {
         }
     }
 }
-*/
+*/