Update Gradle version (fixed)

base/build.gradle

@@ -10,9 +10,9 @@ android {
     def gitBranch = (System.getenv('GIT_BRANCH') == null ? 'local' : System.getenv('GIT_BRANCH').replace('origin/', ''))
     def releaseType = (System.getenv('RELEASE_TYPE') == null ? 'NONE' : System.getenv('RELEASE_TYPE'))
     def updateUrls = (System.getenv('UPDATE_URLS') == null ? '"https://popcorntime.sh/android-update.json"' : System.getenv('UPDATE_URLS'))
-    def animeUrls = (System.getenv('ANIME_URLS') == null ? '"https://anime.api-fetch.website/"' : System.getenv('ANIME_URLS'))
-    def movieUrls = (System.getenv('MOVIE_URLS') == null ? '"https://movies-v2.api-fetch.website/"' : System.getenv('MOVIE_URLS'))
-    def tvUrls = (System.getenv('TV_URLS') == null ? '"http://tv-v2.api-fetch.website/"' : System.getenv('TV_URLS'))
+    def animeUrls = (System.getenv('ANIME_URLS') == null ? '"https://anime.api-fetch.sh/"' : System.getenv('ANIME_URLS'))
+    def movieUrls = (System.getenv('MOVIE_URLS') == null ? '"https://movies-v2.api-fetch.sh/"' : System.getenv('MOVIE_URLS'))
+    def tvUrls = (System.getenv('TV_URLS') == null ? '"https://tv-v2.api-fetch.sh/"' : System.getenv('TV_URLS'))
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdk

build.gradle

@@ -5,9 +5,10 @@ buildscript {
         //temporary to solve hugo error
         mavenCentral()
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
@@ -81,12 +82,9 @@ def renameOutputFiles(Project project, variant) {
 
         // Customise APK filenames
         if (outputFileName.contains("debug")) {
-            outputFileName = outputFileName.replace("debug", "development").replace(".apk", "-" + (System.getenv("BUILD_NUMBER") ?: "local") + ".apk")
+            output.outputFileName = outputFileName.replace("debug", "development").replace(".apk", "-" + (System.getenv("BUILD_NUMBER") ?: "local") + ".apk")
         } else {
-            outputFileName = outputFileName.replace(".apk", "-" + variant.versionName + ".apk")
+            output.outputFileName = outputFileName.replace(".apk", "-" + variant.versionName + ".apk")
         }
-
-        // normal APK (already aligned)
-        output.outputFile = new File(output.outputFile.parent, outputFileName)
     }
 }

connectsdk/AndroidManifest.xml

@@ -1,11 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.connectsdk"
-    android:versionCode="11"
-    android:versionName="1.5.0" >
-
-    <uses-sdk
-        android:minSdkVersion="10"
-        android:targetSdkVersion="22" />
-
-    <application />
-</manifest>
+<manifest package="com.connectsdk" />

connectsdk/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.6.2'
 //        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
     }
 }
@@ -54,6 +55,14 @@ build.dependsOn jacocoTestReport
 android {
     compileSdkVersion rootProject.ext.compileSdk
     buildToolsVersion rootProject.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
+        versionCode 11
+        versionName "1.5.0"
+    }
+
     useLibrary 'org.apache.http.legacy'
 
     packagingOptions {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jul 03 10:16:50 CET 2018
+#Thu Apr 16 21:44:09 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

mobile/build.gradle

@@ -36,13 +36,16 @@ android {
         }
     }
 
+    flavorDimensions 'platform'
     productFlavors {
         arm {
+            dimension 'platform'
             ndk {
                 abiFilters "arm64-v8a", "armeabi-v7a"
             }
         }
         x86 {
+            dimension 'platform'
             ndk {
                 abiFilters "x86", "x86_64"
             }
@@ -79,7 +82,7 @@ dependencies {
 
     compile 'de.hdodenhof:circleimageview:2.0.0'
     compile "com.jakewharton:butterknife:${rootProject.ext.butterknifeVersion}"
-    compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.github.nirhart:parallaxscroll:dd53d1f9d1'
     compile 'com.larswerkman:HoloColorPicker:1.5'
     compile 'com.gu:option:1.3'
     compile 'net.rdrei.android.dirchooser:library:3.0@aar'

tv/build.gradle

@@ -37,13 +37,16 @@ android {
         }
     }
 
+    flavorDimensions 'platform'
     productFlavors {
         arm {
+            dimension 'platform'
             ndk {
                 abiFilters "arm64-v8a", "armeabi-v7a"
             }
         }
         x86 {
+            dimension 'platform'
             ndk {
                 abiFilters "x86", "x86_64"
             }