Adjust for build using Gradle 8; remove mavenHEADpkcs12-keybag-fixes

5 files changed, 14 insertions, 60 deletions

diff --git a/build.gradle b/build.gradle
index 3ddffc21..dbb71e83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,19 +9,18 @@ ext {
 subprojects {
     apply plugin: 'eclipse'
     apply plugin: 'java'
-    apply plugin: 'maven'
     apply plugin: 'signing'
 
     group = 'com.madgag.spongycastle'
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from 'build/docs/javadoc'
     }
 
     task sourcesJar(type: Jar) {
         from sourceSets.main.allSource
-        classifier = 'sources'
+        archiveClassifier = 'sources'
     }
 
     artifacts {
@@ -37,61 +36,16 @@ subprojects {
         }
     }
 
-    if (project.hasProperty("sonatypeUsername")) {
-        uploadArchives {
-            repositories {
-                mavenDeployer {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-                    repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                        authentication(userName: sonatypeUsername, password: sonatypePassword)
-                    }
-
-                    pom.project {
-                        name 'Spongy Castle'
-                        packaging 'jar'
-                        description 'Spongy Castle is a package-rename (org.bouncycastle.* to org.spongycastle.*) of Bouncy Castle\n' +
-                                'intended for the Android platform. Android unfortunately ships with a stripped-down version of\n' +
-                                'Bouncy Castle, which prevents easy upgrades - Spongy Castle overcomes this and provides a full,\n' +
-                                'up-to-date version of the Bouncy Castle cryptographic libs.'
-                        url 'http://rtyley.github.io/spongycastle/'
-
-                        scm {
-                            url 'scm:git@github.com:rtyley/spongycastle.git'
-                            connection 'scm:git@github.com:rtyley/spongycastle.git'
-                            developerConnection 'scm:git@github.com:rtyley/spongycastle.git'
-                        }
-
-                        licenses {
-                            license {
-                                name 'Bouncy Castle Licence'
-                                url 'http://www.bouncycastle.org/licence.html'
-                                distribution 'repo'
-                            }
-                        }
-
-                        developers {
-                            developer {
-                                id 'rtyley'
-                                name 'Roberto Tyley'
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version: '4.11'
+        testImplementation group: 'junit', name: 'junit', version: '4.11'
     }
 
-    sourceCompatibility = 6
-    targetCompatibility = 1.6
+    sourceCompatibility = 7
+    targetCompatibility = 1.7
     version = '1.51.0.0'
 
     test {
diff --git a/mail/build.gradle b/mail/build.gradle
index 2a3fa376..7bc526fa 100644
--- a/mail/build.gradle
+++ b/mail/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    compile project(':core')
-    compile project(':pkix')
-    compile project(':prov')
+    implementation project(':core')
+    implementation project(':pkix')
+    implementation project(':prov')
 
-    compile group: 'javax.mail', name: 'mail', version: '1.4.+'
+    implementation group: 'javax.mail', name: 'mail', version: '1.4.+'
 }
diff --git a/pg/build.gradle b/pg/build.gradle
index 95e031b3..a38bc329 100644
--- a/pg/build.gradle
+++ b/pg/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    compile project(':core')
-    compile project(':prov')
+    implementation project(':core')
+    implementation project(':prov')
 }
diff --git a/pkix/build.gradle b/pkix/build.gradle
index 95e031b3..a38bc329 100644
--- a/pkix/build.gradle
+++ b/pkix/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    compile project(':core')
-    compile project(':prov')
+    implementation project(':core')
+    implementation project(':prov')
 }
diff --git a/prov/build.gradle b/prov/build.gradle
index 41bb3c5c..e4dbb7fe 100644
--- a/prov/build.gradle
+++ b/prov/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compile project(':core')
+    implementation project(':core')
 }