diff --git a/gradle.properties b/gradle.properties index 2cbf820..7e7f588 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,15 +8,4 @@ project_public_version=0.1.0 project_public_group=com.insanusmokrassar project_public_description=Simple DI library -project_public_name=PostsSystemCore - -project_public_license_name=Apache-2.0 -project_public_license_fullname=The Apache Software License, Version 2.0 -project_public_license_url=https://git.insanusmokrassar.com/InsanusMokrassar/SDI/src/master/LICENSE - -project_bintray_repo=InsanusMokrassar - -project_url=https://git.insanusmokrassar.com/InsanusMokrassar/SDI -project_vcs=https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git - kotlin.incremental.multiplatform=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 01a286e..30b572c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip diff --git a/maven.publish.gradle b/maven.publish.gradle index d65da38..814cc05 100644 --- a/maven.publish.gradle +++ b/maven.publish.gradle @@ -25,29 +25,32 @@ publishing { asNode().children().last() + { resolveStrategy = Closure.DELEGATE_FIRST - description "${project_public_description}" - name "${project_public_name}" - url "${project_url}" + description "Simple DI library" + name "Simple Dependency Injection" + url "https://git.insanusmokrassar.com/InsanusMokrassar/SDI" scm { - developerConnection "scm:git:[fetch=]${project_vcs}[push=]${project_vcs}" - url "${project_vcs}" + developerConnection "scm:git:[fetch=]https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git[push=]https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git" + url "https://git.insanusmokrassar.com/InsanusMokrassar/SDI.git" } developers { - developer { - id "InsanusMokrassar" - name "Ovsyannikov Alexey" - email "ovsyannikov.alexey95@gmail.com" - } + + developer { + id "InsanusMokrassar" + name "Ovsiannikov Aleksei" + email "ovsyannikov.alexey95@gmail.com" + } + } licenses { - license { - name "${project_public_license_fullname}" - url "${project_public_license_url}" - distribution "repo" - } + + license { + name "Apache Software License 2.0" + url "https://git.insanusmokrassar.com/PostsSystem/SDI/src/master/LICENSE" + } + } } } @@ -57,4 +60,4 @@ publishing { signing { useGpgCmd() sign(publishing.publications) -} +} \ No newline at end of file diff --git a/publish.gradle b/publish.gradle index 5a9be9a..cf49a3e 100644 --- a/publish.gradle +++ b/publish.gradle @@ -6,10 +6,10 @@ bintray { user = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') key = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY') pkg { - repo = "$project_bintray_repo" + repo = "InsanusMokrassar" name = "${project.name}" - vcsUrl = "${project_url}" - licenses = ["${project_public_license_name}"] + vcsUrl = "https://github.com/InsanusMokrassar/SDI_mirror" + licenses = ["Apache-2.0"] version { name = "${project.version}" released = new Date() @@ -24,4 +24,4 @@ bintrayUpload.doFirst { } } -bintrayUpload.dependsOn publishToMavenLocal +bintrayUpload.dependsOn publishToMavenLocal \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index fdeb278..fc2aa0c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1 @@ rootProject.name = 'sdi' - -enableFeaturePreview("GRADLE_METADATA")