release 1.1.1 upgrade to Gradle 7.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1 (released 23.04.2021)
+* upgrade to Selenide 5.20.4
+* upgrade to Gradle 7.0
+
 ## 1.1.0 (released 20.03.2021)
 * #6 Added get & set clipboard methods  --  thanks to Dmitriy Budim
 * upgrade to Selenide 5.20.0

build.gradle

@@ -1,12 +1,11 @@
 plugins {
   id 'java-library'
   id 'idea'
-  id 'maven'
 }
 
 group = 'org.selenide'
 archivesBaseName = 'selenide-selenoid'
-version = '1.1.0'
+version = '1.1.1'
 
 apply from: rootProject.file('gradle/compilation.gradle')
 apply from: rootProject.file('gradle/dependencies.gradle')

gradle/deploy.gradle

@@ -6,7 +6,6 @@ jar {
       "Implementation-Version": version,
       "Implementation-Vendor": "selenide.org")
   }
-  from sourceSets.main.output
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
@@ -24,72 +23,65 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
   from javadoc.destinationDir
 }
 
-artifacts {
-  archives jar
-  archives sourcesJar
-  archives javadocJar
-}
-
-
 if (project.hasProperty("signing.keyId")) {
   apply plugin: 'signing'
+  apply plugin: 'maven-publish'
 
   signing {
-    sign configurations.archives
+    afterEvaluate {
+      sign publishing.publications.mavenJava
+    }
   }
 
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+  artifacts {
+    archives jar
+    archives sourcesJar
+    archives javadocJar
+  }
 
-        repository(url: project.version.endsWith("-SNAPSHOT") ?
-          'https://oss.sonatype.org/content/repositories/snapshots/' :
-          'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
-          authentication(userName: "$sonatypeUsername", password: "$sonatypePassword")
+  publishing {
+    repositories {
+      maven {
+        name 'Maven'
+        url project.version.endsWith("-SNAPSHOT") ?
+                'https://oss.sonatype.org/content/repositories/snapshots/' :
+                'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+        credentials {
+          username "$sonatypeUsername"
+          password "$sonatypePassword"
         }
-
-        pom.project {
-          name archivesBaseName
-          packaging 'jar'
-          description 'Selenoid plugin for Selenide'
-          url 'https://github.com/selenide/selenide-selenoid'
-
-          scm {
-            url 'scm:[email protected]:selenide/selenide-selenoid.git'
-            connection 'scm:[email protected]:selenide/selenide-selenoid.git'
-            developerConnection 'scm:[email protected]:selenide/selenide-selenoid.git'
-          }
-
+      }
+    }
+    publications {
+      mavenJava(MavenPublication) {
+        groupId "${project.group}"
+        artifactId "${project.name}"
+
+        artifact(jar)
+        artifact(sourcesJar)
+        artifact(javadocJar)
+
+        pom {
+          name = archivesBaseName
+          description = 'Selenoid plugin for Selenide'
+          url = 'https://github.com/selenide/selenide-selenoid'
           licenses {
             license {
-              name 'MIT'
-              url 'https://opensource.org/licenses/MIT'
-              distribution 'repo'
+              name = 'MIT'
+              url = 'https://opensource.org/licenses/MIT'
             }
           }
-
           developers {
             developer {
-              id 'asolntsev'
-              name 'Andrei Solntsev'
+              id = 'asolntsev'
+              name = 'Andrei Solntsev'
             }
           }
-        }
-
-        //mess with the generated pom to set the 'packaging' tag
-        pom.withXml { XmlProvider xmlProvider ->
-          def xml = xmlProvider.asString()
-          def pomXml = new XmlParser().parse(new ByteArrayInputStream(xml.toString().bytes))
-
-          pomXml.version[0] + { packaging('jar') }
-
-          def newXml = new StringWriter()
-          def printer = new XmlNodePrinter(new PrintWriter(newXml))
-          printer.preserveWhitespace = true
-          printer.print(pomXml)
-          xml.setLength(0)
-          xml.append(newXml.toString())
+          scm {
+            connection = 'scm:[email protected]:selenide/selenide-selenoid.git'
+            developerConnection = 'scm:[email protected]:selenide/selenide-selenoid.git'
+            url = 'https://github.com/selenide/selenide-selenoid'
+          }
         }
       }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists