Merge remote-tracking branch 'origin/master'

recloudstream · Mar 22, 2024 · d83982f · d83982f
2 parents ba2f613 + 4468ce3
commit d83982f
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 48,761 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
     id("com.google.devtools.ksp")
     id("kotlin-android")
     id("org.jetbrains.dokka")
-    id("androidx.baselineprofile")
 }
 
 val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
@@ -233,11 +232,6 @@ dependencies {
     implementation("androidx.work:work-runtime:2.9.0")
     implementation("androidx.work:work-runtime-ktx:2.9.0")
     implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib
-
-    // Baseline Profile and Automation
-    implementation("androidx.profileinstaller:profileinstaller:1.3.1")
-    implementation("androidx.test.uiautomator:uiautomator:2.3.0")
-    "baselineProfile"(project(":baselineprofile"))
 }
 
 tasks.register("androidSourcesJar", Jar::class) {

diff --git a/app/src/prereleaseRelease/generated/baselineProfiles/baseline-prof.txt b/app/src/prereleaseRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/prereleaseRelease/generated/baselineProfiles/startup-prof.txt b/app/src/prereleaseRelease/generated/baselineProfiles/startup-prof.txt
diff --git a/baselineProfile/.gitignore b/baselineProfile/.gitignore
diff --git a/baselineProfile/build.gradle.kts b/baselineProfile/build.gradle.kts
diff --git a/baselineProfile/src/main/AndroidManifest.xml b/baselineProfile/src/main/AndroidManifest.xml
diff --git a/...file/src/main/java/com/lagradost/cloudstream3/baselineprofile/BaselineProfileGenerator.kt b/...file/src/main/java/com/lagradost/cloudstream3/baselineprofile/BaselineProfileGenerator.kt
diff --git a/...lineProfile/src/main/java/com/lagradost/cloudstream3/baselineprofile/StartupBenchmarks.kt b/...lineProfile/src/main/java/com/lagradost/cloudstream3/baselineprofile/StartupBenchmarks.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.2.2")
+        classpath("com.android.tools.build:gradle:8.2.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10")
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle.kts files
     }
 }
 
@@ -19,12 +23,7 @@ allprojects {
 }
 
 plugins {
-    // these work only in this order, don't change.
     id("com.google.devtools.ksp") version "1.9.22-1.0.16" apply false
-    id("com.android.test") version "8.2.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("androidx.baselineprofile") version "1.2.2" apply false
-    id("com.android.application") version "8.2.2" apply false
 }
 
 tasks.register<Delete>("clean") {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 30 17:11:15 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,12 +1,3 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        google()
-        mavenCentral()
-    }
-}
-
 rootProject.name = "CloudStream"
 
-include(":app")
-include(":baselineprofile")
+include(":app")