Fix commit

Author: azharkova

.gitignore

@@ -2,4 +2,16 @@
 /.gradle/
 /build/
 /build/classes/kotlin/ios/main/
-/build/classes/kotlin/jvm/main/
+/build/classes/kotlin/jvm/main/
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+*/build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata/
+Pods/

.idea/artifacts/di_multiplatform_lib_jvm_1_0_4_5.xml

@@ -1,14 +1,13 @@
 plugins {
     kotlin("multiplatform") version "1.4.32"
-    id("maven-publish")
-   // id("convention.publication")
+    //id("maven-publish")
+    id("convention.publication")
 }
 
 group = "io.github.anioutkazharkova"
 version = "1.0.4.5"
 
 repositories {
-    jcenter()
     mavenCentral()
 }
 

.idea/gradle.xml

@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl` // Is needed to turn our build logic written in Kotlin into Gralde Plugin
+}
+
+repositories {
+    gradlePluginPortal() // To use 'maven-publish' and 'signing' plugins in our own plugin
+}

build.gradle.kts

@@ -5,8 +5,8 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Sat Jan 30 22:59:41 GMT+07:00 2021
-signing.keyId=15EDFFBE
-signing.password=Multiplatform
+signing.keyId=SRf6d2NJ
+signing.password=iJmTNKuLYv+y2luyKwrFUa5SWWIa5XmKDVM2DIUt9D77
 signing.secretKeyRingFile=/Users/annazharkova/15EDFFBE.gpg
 ossrhUsername=anioutkazharkova
-ossrhPassword=Anna123456!!
+ossrhPassword=Anna123456!!

convention-plugins/build.gradle.kts

@@ -0,0 +1,91 @@
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.bundling.Jar
+import org.gradle.kotlin.dsl.`maven-publish`
+import org.gradle.kotlin.dsl.signing
+import java.util.*
+
+plugins {
+    `maven-publish`
+    signing
+}
+
+// Stub secrets to let the project sync and build without the publication values set up
+ext["signingKeyId"] = null
+ext["signingPassword"] = null
+ext["signingSecretKeyRingFile"] = null
+ext["ossrhUsername"] = null
+ext["ossrhPassword"] = null
+
+// Grabbing secrets from local.properties file or from environment variables, which could be used on CI
+val secretPropsFile = project.rootProject.file("local.properties")
+if (secretPropsFile.exists()) {
+    secretPropsFile.reader().use {
+        Properties().apply {
+            load(it)
+        }
+    }.onEach { (name, value) ->
+        ext[name.toString()] = value
+    }
+} else {
+    ext["signing.keyId"] = System.getenv("SIGNING_KEY_ID")
+    ext["signing.password"] = System.getenv("SIGNING_PASSWORD")
+    ext["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE")
+    ext["ossrhUsername"] = System.getenv("OSSRH_USERNAME")
+    ext["ossrhPassword"] = System.getenv("OSSRH_PASSWORD")
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
+fun getExtraString(name: String) = ext[name]?.toString()
+
+publishing {
+    // Configure maven central repository
+    repositories {
+        maven {
+            name = "sonatype"
+            setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+            credentials {
+                username = getExtraString("ossrhUsername")
+                password = getExtraString("ossrhPassword")
+            }
+        }
+    }
+
+    // Configure all publications
+    publications.withType<MavenPublication> {
+
+        // Stub javadoc.jar artifact
+        artifact(javadocJar.get())
+
+        // Provide artifacts information requited by Maven Central
+        pom {
+            name.set("DI Kotlin Multiplatform Library")
+            description.set("DI Kotlin Multiplatform Library")
+            url.set("https://github.com/anioutkazharkova/di-multiplatform-lib")
+
+            licenses {
+                license {
+                    name.set("MIT")
+                    url.set("https://opensource.org/licenses/MIT")
+                }
+            }
+            developers {
+                developer {
+                    id.set("anioutkazharkova")
+                    name.set("Anna Zharkova")
+                    email.set("[email protected]")
+                }
+            }
+            scm {
+                url.set("https://github.com/anioutkazharkova/di-multiplatform-lib")
+            }
+
+        }
+    }
+}
+
+signing {
+    sign(publishing.publications)
+}

convention-plugins/gradle.properties

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

convention-plugins/local.properties

@@ -1,11 +1,10 @@
 pluginManagement {
     repositories {
         google()
-        jcenter()
         gradlePluginPortal()
         mavenCentral()
     }
 }
-//includeBuild("convention-plugins")
+includeBuild("convention-plugins")
 rootProject.name = "di-multiplatform-lib"