Merge pull request #169 from ytai/Jitpack

Release on jitpack.io
ytai · Sep 13, 2020 · b666730 · b666730
2 parents 1a49aff + 9ac80ef
commit b666730
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 75 deletions.
diff --git a/IOIOLibAndroid/build.gradle b/IOIOLibAndroid/build.gradle
@@ -1,16 +1,5 @@
 apply plugin: 'com.android.library'
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibAndroid'
-                description = 'IOIO library for Android - common code with ADB support'
-                packaging = 'aar'
-            }
-        }
-    }
-}
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 30

diff --git a/IOIOLibAndroidAccessory/build.gradle b/IOIOLibAndroidAccessory/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 30
@@ -11,18 +12,6 @@ android {
     }
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibAndroidAccessory'
-                description = 'IOIO library for Android - OpenAccessory extenstion'
-                packaging = 'aar'
-            }
-        }
-    }
-}
-
 dependencies {
     api project(":IOIOLibAndroid")
 }
diff --git a/IOIOLibAndroidBluetooth/build.gradle b/IOIOLibAndroidBluetooth/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 30
@@ -11,18 +12,6 @@ android {
     }
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibAndroidBluetooth'
-                description = 'IOIO library for Android - Bluetooth extenstion'
-                packaging = 'aar'
-            }
-        }
-    }
-}
-
 dependencies {
     api project(":IOIOLibAndroid")
 }
diff --git a/IOIOLibAndroidDevice/build.gradle b/IOIOLibAndroidDevice/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 30
@@ -11,18 +12,6 @@ android {
     }
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibAndroidDevice'
-                description = 'IOIO library for Android - USB device extenstion'
-                packaging = 'aar'
-            }
-        }
-    }
-}
-
 dependencies {
     api project(":IOIOLibAndroid")
 }
diff --git a/IOIOLibCore/build.gradle b/IOIOLibCore/build.gradle
@@ -1,16 +1,5 @@
 apply plugin: 'java'
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibCore'
-                description = 'Common core of the IOIO library'
-            }
-        }
-    }
-}
-
 task generateVersionFile(type: GenerateVersion) {
     version = versionString
     outputFile = file("$project.buildDir/classes/main/version.properties")

diff --git a/IOIOLibPC/build.gradle b/IOIOLibPC/build.gradle
@@ -1,16 +1,5 @@
 apply plugin: 'java-library'
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name = 'IOIOLibPC'
-                description = 'IOIO Library for PC applications'
-            }
-        }
-    }
-}
-
 javadoc {
     source = fileTree(dir: 'src/main/java')
     failOnError = false

diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+[![](https://jitpack.io/v/ytai/ioio.svg)](https://jitpack.io/#ytai/ioio)
 <img alt="IOIO Logo" src="https://lh6.googleusercontent.com/-NtccMO1M7f4/UDhhwrx26UI/AAAAAAAAjTI/xwTI4Fb8xVQ/s887/ioio-logo.png">
 The IOIO is a board that provides a host machine the capability of interfacing with external hardware over a variety of commonly used protocols.
 The original IOIO board has been specifically designed to work with Android devices. The newer IOIO-OTG ("on the go") boards work with both Android devices and PC's (details [here](http://ytai-mer.blogspot.com/2012/05/second-generation-of-ioio-is-in-works.html)).
@@ -19,3 +20,24 @@ You can purchase a IOIO-OTG board online from:
 - [CuteDigi](http://www.cutedigi.com/development-tools/pic/ioio-otg-for-android.html).
 - [AliExpress](http://www.aliexpress.com/store/product/Free-Shipping-IOIO-OTG/600038_781363573.html).
 
+## Usage in Gradle
+
+in top `build.gradle`
+
+    allprojects {
+		repositories {
+			...
+			maven { url 'https://jitpack.io' }
+		}
+	}
+
+and in module `build.gradle`
+
+	dependencies {
+	        implementation "com.github.ytai.ioio:IOIOLibAndroidBluetooth:$LATEST"
+            implementation "com.github.ytai.ioio:IOIOLibAndroidAccessory:$LATEST"
+            implementation "com.github.ytai.ioio:IOIOLibAndroidDevice:$LATEST"
+	}
+
+Please see details here https://jitpack.io/#ytai/ioio 
+
diff --git a/build.gradle b/build.gradle
@@ -7,20 +7,18 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 allprojects {
-    group = 'com.github.ytai.ioio'
+    group = 'com.github.ioio'
     version = getTag()
     ext.versionNamespace = 'IOIO'
     ext.versionString = sprintf("%s%s", versionNamespace, version)
 }
 
 subprojects {
-    apply plugin: 'maven'
-    apply plugin: 'signing'
-
     repositories {
         google()
         jcenter()
@@ -48,7 +46,10 @@ static def getTag() {
         tagVersion = process.text.toString().trim() + dirty
     } else {
         def tagVersionToken = tagVersion.split("/")
-        tagVersion = tagVersionToken[2]
+        if (tagVersionToken.size() > 2)
+            tagVersion = tagVersionToken[2]
+        else
+            tagVersion = tagVersionToken[0]
     }
     return tagVersion
 }