JA-49 #time 30m committed changes to build.gradle files for JFrog support

Author: RuMolloy

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

@@ -2,10 +2,10 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
 
-version = '3.0.69Beta_AA-245_AA-246'
+version = '3.0.65Beta'
 
 android {
     compileSdkVersion 25
@@ -56,169 +56,24 @@ android {
     }
 }
 
-//repositories {
-//    mavenCentral()
-//    maven {
-//        url "http://192.168.0.139:8081/artifactory/libs-release-local"
-//        credentials {
-//            username = "alex"
-//            password = "AP5DYAtHgg8mmK4Tnrx6RyrniF6"
-//        }
-//    }
-//    flatDir {
-//        dirs 'libs'
-//    }
-//}
+publishing {
+    artifactoryPublish.dependsOn('build')
+    publications {
+        mavenJava(MavenPublication) {
+            groupId = 'com.shimmersensing'
+            version = project.version
+            artifactId project.getName()
+            artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+        }
+    }
+}
 
 dependencies {
-    //compile 'com.shimmerresearch:shimmerDriver:0.3.3'
-//    compile 'org.apache.commons:commons-lang3:3.4'
-//    compile 'org.apache.commons:commons-math3:3.6'
-//    compile 'org.apache.commons:commons-math:2.2'
     compile 'com.google.guava:guava:20.0'
     compile 'java3d:vecmath:1.3.1'
-//    compile 'commons-collections:commons-collections:3.2'
-
-    //compile 'io.grpc:grpc-okhttp:1.0.0-pre1'
-    //compile 'io.grpc:grpc-protobuf-lite:1.0.0-pre1'
-    //compile 'io.grpc:grpc-stub:1.0.0-pre1']
-
-
-    //compile fileTree(include: ['*.jar'], dir: 'libs')
     compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
     compile files('libs/AndroidBluetoothLibrary.jar')
     compile files('libs/androidplot-core-0.5.0-release.jar')
-    //compile files('libs/ShimmerDriverML.jar')
-    compile(group: 'com.shimmersensing', name: 'rmshimmerapi', version: '1.3') {
-        // excluding org.json which is provided by Android
-        exclude group: 'io.netty'
-        exclude group: 'io.grpc'
-        exclude group: 'com.google.protobuf'
-        exclude group: 'org.apache.commons.math'
-            }
-    compile(group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version: '1.3') {
-        // excluding org.json which is provided by Android
-        exclude group: 'io.netty'
-        exclude group: 'io.grpc'
-        exclude group: 'com.google.protobuf'
-        exclude group: 'org.apache.commons.math'
-    }
-    //For fragments:
+    implementation group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version:'1.3'
     compile 'com.android.support:appcompat-v7:25.3.1'
-
-
-/*
-    install {
-        repositories.mavenInstaller {
-            // This generates POM.xml with proper parameters
-            pom {
-                project {
-                    packaging 'aar'
-                    groupId 'com.shimmerresearch.android'
-                    artifactId 'com.shimmerresearch.android'
-
-                    // Add your description here
-                    name ''
-                    description ''
-                    url ''
-
-                    // Set your license
-                    licenses {
-                        license {
-                            name 'MIT License'
-                            url 'https://opensource.org/licenses/MIT'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id 'stefanosiano'
-                            name 'Stefano Siano'
-                            email '[email protected]'
-                        }
-                    }
-                    scm {
-                        connection ''
-                        developerConnection ''
-                        url ''
-
-                    }
-                }
-            }
-        }
-    }
-*/
-
-
-
-
-    if (project.hasProperty("android")) { // Android libraries
-        task sourcesJar(type: Jar) {
-            classifier = 'sources'
-            from android.sourceSets.main.java.srcDirs
-        }
-
-        task javadoc(type: Javadoc) {
-            source = android.sourceSets.main.java.srcDirs
-            classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-        }
-    } else { // Java libraries
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.allSource
-        }
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
-        from javadoc.destinationDir
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-    publishing{
-        publications {
-            maven(MavenPublication)  {
-                groupId 'com.shimmerresearch.android'
-                version = project.version
-                artifactId project.getName()
-                artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
-            }
-        }
-    }
-
-// https://github.com/bintray/gradle-bintray-plugin
-    File file = new File(rootProject.getProjectDir().getAbsolutePath() + '/gradle.properties')
-    if(file.exists()) {
-        bintray {
-            user = shimmer_bintray_username
-            //this usually comes from gradle.properties file in ~/.gradle
-            key = shimmer_bintray_api_key
-            //this usually comes from gradle.properties file in ~/.gradle
-
-            configurations = ['archives']
-
-            // Package info for BinTray
-            pkg {
-                repo = 'Shimmer'
-                // it is the name that appears in bintray when logged
-                name = 'shimmerandroiddriver'
-                desc = ''
-                websiteUrl = ''
-                vcsUrl = 'https://github.com/ShimmerEngineering/ShimmerAndroidAPI'
-                licenses = ['MIT']
-                publish = true
-                publicDownloadNumbers = true
-                version {
-                    name = project.version
-                    desc = ''
-                    released = new Date()
-                    vcsTag = ''
-                }
-            }
-        }
-    }
-
-	
 }

ShimmerAndroidInstrumentDriver/build.gradle

@@ -1,27 +1,79 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0')
     }
 }
 // Plugin used to upload authenticated files to BinTray through Gradle
 plugins {
-    id "com.jfrog.bintray" version "1.7.3"
+    id "com.jfrog.artifactory" version "4.21.0"
 }
+apply plugin: 'com.jfrog.artifactory'
+apply plugin: 'maven-publish'
+
 allprojects {
     repositories {
         google()
-        jcenter()
         maven {
-            //url  "http://dl.bintray.com/shimmerengineering/Shimmer"
-            url 'https://shimmersensing.jfrog.io/artifactory/dummyLcl'
+            url  "https://shimmersensing.jfrog.io/artifactory/dummyLcl"
+
+        }
+        mavenCentral()
+        mavenLocal()
+    }
+    artifactory {
+        contextUrl = "${artifactory_contextUrl}"
+        publish {
+            repository {
+                repoKey = 'dummyLcl'
+                username = "${artifactory_user}"
+                password = "${artifactory_password}"
+                maven = true
+            }
+            defaults {
+                publications('mavenJava')
+            }
+            publishBuildInfo = true
+            publishArtifacts = true
+            publishPom = true
+        }
+        resolve {
+            repository {
+                repoKey = 'dummyLcl'
+                username = "${artifactory_user}"
+                password = "${artifactory_password}"
+                maven = true
+            }
         }
     }
 }
+
+project('ShimmerAndroidInstrumentDriver') {
+    artifactoryPublish.dependsOn('build')
+    publishing {
+        publications {
+            ShimmerAndroidInstrumentDriver(MavenPublication) {
+                groupId = 'com.shimmersensing'
+                version = project.version
+                artifactId project.getName()
+                //artifactId = 'rmandroidapi'
+                //version = '1.3'
+                artifact("$buildDir/outputs/aar/ShimmerAndroidInstrumentDriver}-release.aar")
+            }
+        }
+    }
+
+    artifactoryPublish {
+        publications(publishing.publications.ShimmerAndroidInstrumentDriver)
+    }
+}