clean up dependencies

This commit is contained in:
tom5079
2022-04-04 11:42:21 +09:00
parent bed6d7d6ab
commit df341c777e
7 changed files with 10 additions and 31 deletions

2
.idea/gradle.xml generated
View File

@@ -8,7 +8,7 @@
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/share/java/gradle" /> <option name="gradleHome" value="/usr/share/java/gradle" />
<option name="gradleJvm" value="11" /> <option name="gradleJvm" value="JDK" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

View File

@@ -37,14 +37,12 @@ android {
extra.set("alwaysUpdateBuildId", false) extra.set("alwaysUpdateBuildId", false)
} }
getByName("release") { getByName("release") {
// isMinifyEnabled = true isMinifyEnabled = false
// isShrinkResources = true
applicationIdSuffix = ".beta" applicationIdSuffix = ".beta"
isCrunchPngs = false isCrunchPngs = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
signingConfig = signingConfigs.getByName("debug")
} }
} }
@@ -92,7 +90,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
implementation("androidx.activity:activity-compose:1.4.0") implementation("androidx.activity:activity-compose:1.4.0")
implementation("androidx.navigation:navigation-compose:2.5.0-alpha03") implementation("androidx.navigation:navigation-compose:2.4.1")
implementation(JetpackCompose.FOUNDATION) implementation(JetpackCompose.FOUNDATION)
implementation(JetpackCompose.UI) implementation(JetpackCompose.UI)
@@ -116,12 +114,6 @@ dependencies {
implementation("io.ktor:ktor-client-okhttp:1.6.8") implementation("io.ktor:ktor-client-okhttp:1.6.8")
implementation("io.ktor:ktor-client-serialization:1.6.8") implementation("io.ktor:ktor-client-serialization:1.6.8")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("androidx.activity:activity-ktx:1.4.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.biometric:biometric:1.1.0")
implementation("androidx.work:work-runtime-ktx:2.7.1")
implementation("androidx.room:room-runtime:2.4.2") implementation("androidx.room:room-runtime:2.4.2")
annotationProcessor("androidx.room:room-compiler:2.4.2") annotationProcessor("androidx.room:room-compiler:2.4.2")
kapt("androidx.room:room-compiler:2.4.2") kapt("androidx.room:room-compiler:2.4.2")
@@ -132,8 +124,6 @@ dependencies {
implementation("org.kodein.di:kodein-di-framework-compose:7.11.0") implementation("org.kodein.di:kodein-di-framework-compose:7.11.0")
implementation("com.google.android.material:material:1.5.0")
implementation(platform("com.google.firebase:firebase-bom:29.0.3")) implementation(platform("com.google.firebase:firebase-bom:29.0.3"))
implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-analytics-ktx")
implementation("com.google.firebase:firebase-crashlytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ktx")
@@ -152,8 +142,6 @@ dependencies {
implementation("xyz.quaver:documentfilex:0.7.2") implementation("xyz.quaver:documentfilex:0.7.2")
implementation("xyz.quaver:subsampledimage:0.0.1-alpha19-SNAPSHOT") implementation("xyz.quaver:subsampledimage:0.0.1-alpha19-SNAPSHOT")
implementation("com.google.guava:guava:31.1-jre")
implementation("org.kodein.log:kodein-log:0.12.0") implementation("org.kodein.log:kodein-log:0.12.0")
// debugImplementation("com.squareup.leakcanary:leakcanary-android:2.8.1") // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.8.1")

View File

@@ -24,22 +24,10 @@ import android.content.pm.PackageInfo
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.runtime.snapshots.SnapshotStateList
import androidx.compose.runtime.snapshots.SnapshotStateMap
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import dalvik.system.PathClassLoader import dalvik.system.PathClassLoader
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.kodein.di.DI
import org.kodein.di.bindFactory
import org.kodein.di.bindInstance
import org.kodein.di.bindProvider
import org.kodein.di.compose.rememberInstance
import xyz.quaver.pupil.Pupil
import xyz.quaver.pupil.sources.core.Source import xyz.quaver.pupil.sources.core.Source
import java.util.concurrent.ConcurrentHashMap
private const val SOURCES_FEATURE = "pupil.sources" private const val SOURCES_FEATURE = "pupil.sources"
private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources" private const val SOURCES_PACKAGE_PREFIX = "xyz.quaver.pupil.sources"

View File

@@ -31,6 +31,9 @@ import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController

View File

@@ -1,14 +1,14 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
</style> </style>
<style name="NoActionBarAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="NoActionBarAppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

2
gradlew vendored
View File

@@ -72,7 +72,7 @@ case "`uname`" in
Darwin* ) Darwin* )
darwin=true darwin=true
;; ;;
MSYS* | MINGW* ) MINGW* )
msys=true msys=true
;; ;;
NONSTOP* ) NONSTOP* )