Merge branch 'develop'

app/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "tv.remo.android.controller"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 20
-        versionName "0.19.2"
+        versionCode 21
+        versionName "0.19.3"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.5.10'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,16 +16,13 @@ buildscript {
 }
 
 ext{
-    controlsdk_version = "0.14.0"
+    controlsdk_version = "v0.14.1"
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
-        maven {
-            url  "https://dl.bintray.com/btelman96/maven"
-        }
         maven { url "https://jitpack.io" }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Sep 07 20:03:43 CDT 2019
+#Tue Sep 21 16:40:40 CDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

sdk/build.gradle

@@ -39,9 +39,9 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api "org.btelman.controlsdk:core:$controlsdk_version"
-    api "org.btelman.controlsdk:hardware:$controlsdk_version"
-    api "org.btelman.controlsdk:texttospeech:$controlsdk_version"
+    api "com.github.ControlSDK.ControlSDK:core:$controlsdk_version"
+    api "com.github.ControlSDK.ControlSDK:hardware:$controlsdk_version"
+    api "com.github.ControlSDK.ControlSDK:texttospeech:$controlsdk_version"
     //noinspection GradleDependency. We cannot upgrade this without losing support for Android 4.4 and below
     api 'com.squareup.okhttp3:okhttp:3.12.6'
     api 'com.google.code.gson:gson:2.8.5'

streaming/build.gradle

@@ -37,15 +37,15 @@ android {
 dependencies {
     api project(path: ':mobile-ffmpeg-full-4.4')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api "org.btelman.ffmpeg:core:1.0.2"
-    api 'org.btelman.android:shellutil:1.4'
+    api "com.github.btelman96.ffmpeg-android:core:v1.2.0"
+    api 'com.github.btelman96:shellutil-android:v1.5.6'
     testImplementation 'junit:junit:4.12'
     implementation 'androidx.appcompat:appcompat:1.1.0' //annotations...
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api "org.btelman.controlsdk:core:$controlsdk_version"
+    api "com.github.ControlSDK.ControlSDK:core:$controlsdk_version"
 }
 repositories {
     mavenCentral()