Remove unused dependencies, lower minSdk

breezy-weather · Mar 8, 2024 · cfbef1d · cfbef1d
1 parent eda9a2e
commit cfbef1d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 92 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,9 +5,12 @@ plugins {
 
 android {
     namespace = "org.breezyweather.pixeliconprovider"
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "org.breezyweather.pixeliconprovider"
+        minSdk = 21
+        targetSdk = 34
         versionCode = 2
         versionName = "2.0"
     }
@@ -23,20 +26,23 @@ android {
     }
 
     buildFeatures {
-        compose = true
-        buildConfig = true
+        compose = false
+        buildConfig = false
 
         // Disable some unused things
         aidl = false
         renderScript = false
         shaders = false
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
-}
 
-dependencies {
-    implementation(libs.activity.compose)
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
+
+dependencies {}
diff --git a/app/src/main/java/org/breezyweather/pixeliconprovider/MainActivity.kt b/app/src/main/java/org/breezyweather/pixeliconprovider/MainActivity.kt
@@ -16,11 +16,10 @@
 
 package org.breezyweather.pixeliconprovider
 
+import android.app.Activity
 import android.os.Bundle
 
-import androidx.activity.ComponentActivity
-
-class MainActivity : ComponentActivity() {
+class MainActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         finish()

diff --git a/app/src/main/java/org/breezyweather/pixeliconprovider/PixelMoonDrawable.kt b/app/src/main/java/org/breezyweather/pixeliconprovider/PixelMoonDrawable.kt
@@ -26,7 +26,6 @@ import android.graphics.PorterDuffXfermode
 import android.graphics.Rect
 import android.graphics.Xfermode
 import android.graphics.drawable.Drawable
-import androidx.annotation.ColorInt
 import kotlin.math.min
 import kotlin.math.sin
 
@@ -36,7 +35,6 @@ class PixelMoonDrawable : Drawable() {
     }
     private val mClearXfermode: Xfermode
 
-    @ColorInt
     private val mCoreColor: Int = Color.rgb(180, 138, 255)
     private var mAlpha: Float = 1f
     private var mBounds: Rect

diff --git a/app/src/main/java/org/breezyweather/pixeliconprovider/PixelSunDrawable.kt b/app/src/main/java/org/breezyweather/pixeliconprovider/PixelSunDrawable.kt
@@ -23,7 +23,6 @@ import android.graphics.Paint
 import android.graphics.PixelFormat
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import androidx.annotation.ColorInt
 import kotlin.math.min
 import kotlin.math.sin
 
@@ -32,7 +31,6 @@ class PixelSunDrawable : Drawable() {
         isAntiAlias = true
     }
 
-    @ColorInt
     private val mColor: Int = Color.rgb(255, 215, 5)
     private var mAlpha: Float = 1f
     private var mBounds: Rect

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,28 +1,6 @@
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.BasePlugin
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-
-subprojects {
-    tasks.withType<KotlinJvmCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
-        }
-    }
-
-    plugins.withType<BasePlugin> {
-        configure<BaseExtension> {
-            compileSdkVersion(AndroidConfig.compileSdk)
-            defaultConfig {
-                minSdk = AndroidConfig.minSdk
-                targetSdk = AndroidConfig.targetSdk
-            }
-
-            compileOptions {
-                sourceCompatibility = JavaVersion.VERSION_1_8
-                targetCompatibility = JavaVersion.VERSION_1_8
-            }
-        }
-    }
+plugins {
+    id("com.android.application") version "8.3.0" apply false
+    kotlin("android") version "1.9.23" apply false
 }
 
 tasks.register<Delete>("clean") {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,12 +1,4 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            val regex = "com.android.(library|application)".toRegex()
-            if (regex matches requested.id.id) {
-                useModule("com.android.tools.build:gradle:${requested.version}")
-            }
-        }
-    }
     repositories {
         gradlePluginPortal()
         google()