Merges new channel API features working branch

build.gradle

@@ -1,14 +1,16 @@
 buildscript {
-	ext.kotlin_version = '1.3.50'
+	ext.kotlin_version = '1.3.61'
 	ext.dokka_version = '0.9.17'
+	ext.gradle_bintray_version = '1.8.4'
 	repositories {
 		google()
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:3.5.1'
+		classpath 'com.android.tools.build:gradle:3.5.2'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 		classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"
+		classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_version"
 	}
 }
 

channel-sdk/build.gradle

@@ -2,15 +2,17 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'org.jetbrains.dokka'
+apply plugin: 'maven-publish'
+apply plugin: 'com.jfrog.bintray'
 
 android {
-	compileSdkVersion 27
+	compileSdkVersion 29
 	defaultConfig {
 		minSdkVersion 15
-		targetSdkVersion 27
+		targetSdkVersion 29
 		versionCode 1
-		versionName "1.0"
-		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+		versionName "0.5.0"
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 	buildTypes {
 		release {
@@ -50,13 +52,81 @@ android {
 			suppress = true
 		}
 	}
+
+	task sourcesJar(type: Jar) {
+		classifier = 'sources'
+		from android.sourceSets.main.java.srcDirs
+	}
+	task javadocJar(type: Jar, dependsOn: dokka) {
+		classifier = 'javadoc'
+		from dokka.outputDirectory
+	}
+
+	publishing {
+		publications {
+			channelsSdk(MavenPublication) {
+				groupId 'com.zello'
+				artifactId 'zello-channel-sdk'
+				version android.defaultConfig.versionName
+				// Change release to debug below for development
+				artifact "$buildDir/outputs/aar/release/zello-${archivesBaseName}.aar"
+				artifact sourcesJar
+				artifact javadocJar
+
+				pom.withXml {
+					def dependenciesNode = asNode().appendNode('dependencies')
+					configurations.implementation.allDependencies.each { dependency ->
+						def dependencyNode = dependenciesNode.appendNode('dependency')
+						dependencyNode.appendNode('groupId', dependency.group)
+						dependencyNode.appendNode('artifactId', dependency.name)
+						dependencyNode.appendNode('version', dependency.version)
+					}
+				}
+			}
+		}
+
+		// Uncomment mavenLocal definition for development
+//		repositories {
+//			mavenLocal()
+//		}
+	}
+
+	Properties localProperties = new Properties()
+	localProperties.load(project.rootProject.file('local.properties').newDataInputStream())
+	def bintrayUser = localProperties.getProperty('bintray.user')
+	def bintrayApiKey = localProperties.getProperty('bintray.apikey')
+
+	bintray {
+		user = bintrayUser
+		key = bintrayApiKey
+
+		dryRun = false
+		publish = false
+		override = true
+
+		pkg {
+			repo = 'zello-channel-sdk'
+			name = 'zello-channel-sdk'
+			publications = ['channelsSdk']
+
+			version {
+				name = android.defaultConfig.versionName
+			}
+		}
+	}
+
+	// Library for testing
+	useLibrary 'android.test.mock'
 }
 
 dependencies {
-	implementation 'com.android.support:appcompat-v7:27.1.1'
+	implementation 'androidx.appcompat:appcompat:1.1.0'
 	implementation 'com.squareup.okhttp3:okhttp:3.10.0'
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2'
 	testImplementation 'junit:junit:4.12'
-	androidTestImplementation 'com.android.support.test:runner:1.0.2'
-	androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+	androidTestImplementation 'androidx.test:runner:1.2.0'
+	androidTestImplementation 'androidx.test:rules:1.2.0'
 }

channel-sdk/proguard-rules.pro

@@ -23,18 +23,28 @@
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class com.zello.channel.sdk.BuildConfig { *; }
 
+-keep public enum com.zello.channel.sdk.ChannelFeature { *; }
+-keep public class com.zello.channel.sdk.ImageInfo { *; }
 -keep public class com.zello.channel.sdk.IncomingVoiceConfiguration { *; }
 -keep public class com.zello.channel.sdk.IncomingVoiceStream { *; }
 -keep public class com.zello.channel.sdk.IncomingVoiceStreamInfo { *; }
+-keep public class com.zello.channel.sdk.InformationalError { *; }
+-keep public class com.zello.channel.sdk.InvalidImageMessageError { *; }
+-keep public class com.zello.channel.sdk.InvalidMessageFormatError { *; }
+-keep public class com.zello.channel.sdk.Location { *; }
 -keep public class com.zello.channel.sdk.OutgoingVoiceConfiguration { *; }
 -keep public class com.zello.channel.sdk.OutgoingVoiceStream { *; }
 -keep public enum com.zello.channel.sdk.OutgoingVoiceStreamError { *; }
 -keep public enum com.zello.channel.sdk.ReconnectReason { *; }
+-keep public class com.zello.channel.sdk.SendImageError { *; }
+-keep public class com.zello.channel.sdk.SendLocationError { *; }
+-keep public class com.zello.channel.sdk.SentLocationCallback { *; }
 -keep public class com.zello.channel.sdk.Session { *; }
 -keep public class com.zello.channel.sdk.Session$Builder { *; }
--keep public enum com.zello.channel.sdk.SessionConnectError { *; }
+-keep public class com.zello.channel.sdk.SessionConnectError { *; }
 -keep public enum com.zello.channel.sdk.SessionConnectError$Code { *; }
 -keep public class com.zello.channel.sdk.SessionListener { *; }
+-keep public class com.zello.channel.sdk.SessionListener$DefaultImpls { *; }
 -keep public class com.zello.channel.sdk.SessionLogger { *; }
 -keep public class com.zello.channel.sdk.SessionLoggerAdb { *; }
 -keep public class com.zello.channel.sdk.SessionLoggerNull { *; }