update publishing script

tinkoff-mobile-tech · May 12, 2023 · de8f518 · de8f518
1 parent 8444684
commit de8f518
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/gradle/publish-lib.gradle b/gradle/publish-lib.gradle
@@ -3,7 +3,7 @@ apply plugin: 'signing'
 
 def getReleaseRepositoryUrl() {
     return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-    : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
 }
 
 def getRepositoryUsername() {
@@ -21,9 +21,6 @@ afterEvaluate {
                 from components.release
                 groupId GROUP
                 version VERSION_NAME
-                afterEvaluate {
-                    artifact sourcesJar
-                }
                 pom {
                     name = project.displayName
                     packaging = "aar"
@@ -61,18 +58,17 @@ afterEvaluate {
         }
     }
 
-    task sourcesJar(type: Jar) {
-    archiveClassifier.set("sources")
-    from android.sourceSets.main.java.srcDirs
-}
-
     signing {
         required { true }
         sign publishing.publications.release
     }
 }
 
-tasks.withType(Javadoc) {
-    options.addStringOption('encoding', 'UTF-8')
-    options.addStringOption('charSet', 'UTF-8')
-}
+android {
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
diff --git a/ti-recycler/build.gradle → ti-recycler/build.gradle.kts b/ti-recycler/build.gradle → ti-recycler/build.gradle.kts
@@ -1,9 +1,12 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    id("maven-publish")
+    id("signing")
 }
 
-apply from: "../gradle/publish-lib.gradle"
+apply(from = "../gradle/publish-lib.gradle")
+
 
 android {
     namespace = "ru.tinkoff.mobile.tech.ti_recycler"
@@ -13,15 +16,15 @@ android {
         minSdk = 21
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility(JavaVersion.VERSION_11)
+        targetCompatibility(JavaVersion.VERSION_11)
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 
 dependencies {
-    api "androidx.core:core-ktx:1.10.0"
-    api "androidx.recyclerview:recyclerview:1.3.0"
+    api("androidx.core:core-ktx:1.10.0")
+    api("androidx.recyclerview:recyclerview:1.3.0")
 }