Merge pull request #58 from netguru/update_dependencies

Fix artifact uploading

Author: Samuel Urbanowicz

android/build.gradle

@@ -16,47 +16,45 @@ publishing {
             artifact("$buildDir/outputs/aar/android-release.aar")
             artifact sourcesJar
             artifactId 'kissme-android'
+            version project.libraryVersion
 
-            //The publication doesn't know about our dependencies, so we have to manually add them to the pom
             pom.withXml {
                 def dependenciesNode = asNode().appendNode('dependencies')
-
-                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
-                configurations.compile.allDependencies.each {
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.group)
-                    dependencyNode.appendNode('artifactId', it.name)
-                    dependencyNode.appendNode('version', it.version)
+                // Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
+                configurations.implementation.allDependencies.each {
+                    // Ensure dependencies such as fileTree are not included in the pom.
+                    if (it.name != 'unspecified') {
+                        println(it.name)
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
+                    }
                 }
             }
         }
     }
 }
 
 android {
-    compileSdkVersion androidCompileSdkVersion
+    compileSdkVersion 28
     defaultConfig {
-        minSdkVersion androidMinSdkVersion
-    }
-    testOptions.unitTests.includeAndroidResources = true
-
-    sourceSets.all {
-        it.java.srcDir "src/$it.name/kotlin"
+        minSdkVersion 23
+        targetSdkVersion 28
+        versionCode 1
+        versionName '1.0'
     }
-
-    // TODO replace with https://issuetracker.google.com/issues/72050365 once released.
-    libraryVariants.all {
-        it.generateBuildConfig.enabled = false
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
     }
 }
 
 dependencies {
     expectedBy project(':common')
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    // compile type binaryprefs dependency is needed to specify that 
-    // it should be included in the .pom file of the kissme-android artifact
-    // TODO: find a better way to declare it
-    compile "com.github.yandextaxitech:binaryprefs:1.0.1"
+    implementation "com.github.yandextaxitech:binaryprefs:1.0.1"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "io.mockk:mockk:1.9.3"

build.gradle

@@ -12,7 +12,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-native-gradle-plugin:$kotlin_version"
         classpath "com.android.tools.build:gradle:3.4.0"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.2-SNAPSHOT'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 

buildsystem/publish-bintray.gradle

@@ -3,6 +3,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 // ------------- tasks
+
 publishing {
     repositories {
         maven { url = 'https://dl.bintray.com/netguru/maven/' }
@@ -18,10 +19,14 @@ bintray {
         repo = 'maven'
         name = 'Kissme'
         publish = true
+        publicDownloadNumbers = true
+        licenses = ['Apache-2.0']
+        vcsUrl = 'https://github.com/netguru/Kissme'
         version {
             name = project.version
             vcsTag = project.version
             released  = new Date()
+            vcsTag = this.version
         }
     }
 }
@@ -31,6 +36,6 @@ bintrayUpload.dependsOn publishToMavenLocal
 bintrayUpload.doFirst {
     publications = project.publishing.publications.findAll { !it.name.contains('test') }.collect {
         println("Uploading artifact '$it.groupId:$it.artifactId:$it.version' from publication '$it.name'")
-        it
+        it.name
     }
-} 
+}

common/build.gradle

@@ -5,6 +5,7 @@ publishing {
         mavenJava(MavenPublication) {
             from components.java
             artifactId "kissme-common"
+            version project.libraryVersion
         }
     }
 }