Update publishing and RAEDME

skrugly · Apr 13, 2021 · a0c6ac4 · a0c6ac4
1 parent 613cd8a
commit a0c6ac4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ Mirakle is designed specially for Gradle build system. It works as seamless as p
 ```groovy
 initscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.instamotor:mirakle:1.4.2"
+        classpath 'io.github.adambl4:mirakle:1.4.2'
     }
 }
  

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -4,7 +4,6 @@ version benchmarkVersion
 
 //apply plugin: 'maven'
 //apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
 
 repositories {
     mavenCentral()
@@ -57,7 +56,7 @@ def pomConfig = {
     }
 }*/
 
-bintray {
+/*bintray {
     user = System.getenv('BINTRAY_USER')
     key = System.getenv('BINTRAY_API_KEY')
     publish = true
@@ -73,13 +72,13 @@ bintray {
         version {
             name = benchmarkVersion
 
-            /*gpg { //TODO
+            *//*gpg { //TODO
                 sign = true
                 passphrase = System.getenv('BINTRAY_GPG_PASSPHRASE')
-            }*/
+            }*//*
         }
     }
-}
+}*/
 
 task validatePublishing {
     doLast {
@@ -90,4 +89,4 @@ task validatePublishing {
     }
 }
 
-bintrayUpload.dependsOn validatePublishing
+//bintrayUpload.dependsOn validatePublishing
diff --git a/build.gradle b/build.gradle
@@ -11,34 +11,23 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        //classpath 'gradle.plugin.de.fuerstenau:BuildConfigPlugin:1.1.8'
         classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.0"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
-apply plugin: 'maven-publish'
 
 allprojects {
-    //apply plugin: 'de.fuerstenau.buildconfig'
     apply plugin: 'kotlin'
     apply plugin: 'idea'
     apply plugin: "com.github.gmazzo.buildconfig"
+    apply plugin: 'maven-publish'
+    apply plugin: 'signing'
 
     buildConfig {
         buildConfigField "String", "VERSION", "\"${rootProject.version}\""
-        //buildConfigField("String", "APP_SECRET", "\"Z3JhZGxlLWphdmEtYnVpbGRjb25maWctcGx1Z2lu\"")
         buildConfigField 'List<String>', 'TESTED_GRADLE_VERSIONS', 'listOf("6.5", "6.6", "6.7.1", "7.0")'
     }
 
-   /* buildConfig {
-        appName = rootProject.name
-        version = rootProject.version
-        packageName = rootProject.group
-        clsName = 'BuildConfig'
-        buildConfigField 'String[]', 'TESTED_GRADLE_VERSIONS', '{"6.5", "6.6", "6.7.1", "7.0"}'
-    }*/
-
     repositories {
         mavenCentral()
         jcenter()

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -1,10 +1,6 @@
 group rootProject.group
 version rootProject.version
 
-apply plugin: 'maven-publish'
-//apply plugin: 'com.jfrog.bintray'
-
-
 compileKotlin {
     kotlinOptions {
         useIR = true
@@ -45,50 +41,42 @@ def pomConfig = {
 }
 
 publishing {
+    repositories {
+        maven {
+            credentials {
+                username = "$ossrhUsername"
+                password = "$ossrhPassword"
+            }
+
+            //"https://s01.oss.sonatype.org/service/local/"
+            url  = "https://s01.oss.sonatype.org/content/repositories/releases/"
+        }
+    }
+
     publications {
         MiraklePublication(MavenPublication) {
             from components.java
 
             artifact sourcesJar
 
-            groupId 'com.instamotor'
+            groupId 'io.github.adambl4'
             artifactId 'mirakle'
             version rootProject.version
 
             pom.withXml {
                 def root = asNode()
                 root.appendNode('description', 'Gradle plugin to move build process from local to a remote machine.')
                 root.appendNode('name', 'Mirakle')
-                root.appendNode('url', 'https://github.com/Instamotor-Labs/mirakle')
+                root.appendNode('url', 'https://github.com/adambl4/mirakle')
                 root.children().last() + pomConfig
             }
         }
     }
 }
 
-/*bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_API_KEY')
-    publish = true
-
-    pkg {
-        repo = 'maven'
-        name = 'mirakle'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/Instamotor-Labs/mirakle.git'
-        issueTrackerUrl = 'https://github.com/Instamotor-Labs/mirakle/issues'
-        publications = ['MiraklePublication']
-
-        version {
-            name = rootProject.version
-
-            *//*gpg { //TODO
-                sign = true
-                passphrase = System.getenv('BINTRAY_GPG_PASSPHRASE')
-            }*//*
-        }
-    }
-}*/
+signing {
+    sign publishing.publications.MiraklePublication
+}
 
 task validatePublishing {
     doLast {
@@ -99,5 +87,4 @@ task validatePublishing {
     }
 }
 
-//bintrayUpload.dependsOn validatePublishing
-//publishMiraklePublicationPublicationToMavenLocal
+publish.dependsOn validatePublishing