Skip to content

Commit b8509fd

Browse files
committed
Make app buildable again ^.^
1 parent 104aadb commit b8509fd

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ android {
3434
applicationId "tv.remo.android.controller"
3535
minSdkVersion 16
3636
targetSdkVersion 28
37-
versionCode 18
38-
versionName "0.19.0"
37+
versionCode 19
38+
versionName "0.19.1"
3939
multiDexEnabled true
4040
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4141
}

build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.61'
4+
ext.kotlin_version = '1.5.10'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.1.0'
10+
classpath 'com.android.tools.build:gradle:4.2.2'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong
@@ -16,16 +16,13 @@ buildscript {
1616
}
1717

1818
ext{
19-
controlsdk_version = "0.14.0"
19+
controlsdk_version = "v0.14.1"
2020
}
2121

2222
allprojects {
2323
repositories {
2424
google()
2525
jcenter()
26-
maven {
27-
url "https://dl.bintray.com/btelman96/maven"
28-
}
2926
maven { url "https://jitpack.io" }
3027
}
3128
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Sep 07 20:03:43 CDT 2019
1+
#Tue Sep 21 16:40:40 CDT 2021
22
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
34
distributionPath=wrapper/dists
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

sdk/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ dependencies {
3939
androidTestImplementation 'androidx.test:runner:1.2.0'
4040
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4141
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
42-
api "org.btelman.controlsdk:core:$controlsdk_version"
43-
api "org.btelman.controlsdk:hardware:$controlsdk_version"
44-
api "org.btelman.controlsdk:texttospeech:$controlsdk_version"
42+
api "com.github.ControlSDK.ControlSDK:core:$controlsdk_version"
43+
api "com.github.ControlSDK.ControlSDK:hardware:$controlsdk_version"
44+
api "com.github.ControlSDK.ControlSDK:texttospeech:$controlsdk_version"
4545
//noinspection GradleDependency. We cannot upgrade this without losing support for Android 4.4 and below
4646
api 'com.squareup.okhttp3:okhttp:3.12.6'
4747
api 'com.google.code.gson:gson:2.8.5'

streaming/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ android {
3737
dependencies {
3838
api project(path: ':mobile-ffmpeg-full-4.4')
3939
implementation fileTree(dir: 'libs', include: ['*.jar'])
40-
api "org.btelman.ffmpeg:core:1.0.2"
41-
api 'org.btelman.android:shellutil:1.4'
40+
api "com.github.btelman96.ffmpeg-android:core:v1.2.0"
41+
api 'com.github.btelman96:shellutil-android:v1.5.6'
4242
testImplementation 'junit:junit:4.12'
4343
implementation 'androidx.appcompat:appcompat:1.1.0' //annotations...
4444
androidTestImplementation 'androidx.test:runner:1.2.0'
4545
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
4646

4747
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
48-
api "org.btelman.controlsdk:core:$controlsdk_version"
48+
api "com.github.ControlSDK.ControlSDK:core:$controlsdk_version"
4949
}
5050
repositories {
5151
mavenCentral()

0 commit comments

Comments
 (0)