fix: Octolapse missing dependencies

feelfreelinux · Mar 28, 2021 · 2195216 · 2195216
1 parent 645076a
commit 2195216
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         versionName = androidGitVersion.name()
         versionCode = maxOf(androidGitVersion.code(), 1)
 
-        testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
+        //testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
     }
 //    buildFeatures {
 ////        // Enables Jetpack Compose for this module
@@ -33,7 +33,6 @@ android {
     }
 
     compileOptions {
-        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -55,7 +54,6 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation("androidx.navigation:navigation-fragment-ktx:2.3.4")
     implementation("androidx.navigation:navigation-ui-ktx:2.3.4")

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.1")
+        classpath("com.android.tools.build:gradle:4.0.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:5.+")
     }

diff --git a/bootstrap-builder/build_bootstrap.sh b/bootstrap-builder/build_bootstrap.sh
@@ -353,6 +353,7 @@ for package_arch in "${TERMUX_ARCHITECTURES[@]}"; do
 	pull_package patch
 	pull_package unzip
 	pull_package ffmpeg
+	pull_package libjpeg-turbo
 
 	# Handle additional packages.
 	for add_pkg in "${ADDITIONAL_PACKAGES[@]}"; do