From d6650e90383e556e6d8dd7bb86a86a6b82575312 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 3 Feb 2021 17:34:01 +0100
Subject: [PATCH] Cleaning up dependencies

---
 app/build.gradle.kts             | 42 +++++++++++++++++++-------------
 app/src/main/AndroidManifest.xml | 10 ++++++++
 build.gradle.kts                 | 11 +++++++--
 buildSrc/build.gradle.kts        |  2 +-
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dfe4810e6..cdabc2143 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,14 +1,9 @@
-import de.kuschku.justcode.properties
-import de.kuschku.justcode.signingData
-
 plugins {
   id("com.android.application")
   id("kotlin-android")
   id("de.kuschku.justcode")
 }
 
-val composeVersion: String by extra
-
 android {
   defaultConfig {
     setMinSdkVersion(21)
@@ -42,20 +37,33 @@ android {
     compose = true
   }
   composeOptions {
-    kotlinCompilerExtensionVersion = composeVersion
+    val androidxComposeVersion: String by project.extra
+    kotlinCompilerExtensionVersion = androidxComposeVersion
   }
 }
 
 dependencies {
-  implementation("androidx.core:core-ktx:1.3.2")
-  implementation("androidx.appcompat:appcompat:1.2.0")
-  implementation("com.google.android.material:material:1.2.1")
-  implementation("androidx.compose.ui:ui:$composeVersion")
-  implementation("androidx.compose.material:material:$composeVersion")
-  implementation("androidx.compose.ui:ui-tooling:$composeVersion")
-  implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-rc01")
-
-  testImplementation("junit:junit:4.13.1")
-  androidTestImplementation("androidx.test.ext:junit:1.1.2")
-  androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
+  val androidxCoreVersion: String by project.extra
+  implementation("androidx.core", "core-ktx", androidxCoreVersion)
+
+  val androidxAppcompatVersion: String by project.extra
+  implementation("androidx.appcompat", "appcompat", androidxAppcompatVersion)
+
+  val mdcVersion: String by project.extra
+  implementation("com.google.android.material", "material", mdcVersion)
+
+  val androidxComposeVersion: String by project.extra
+  implementation("androidx.compose.ui", "ui", androidxComposeVersion)
+  implementation("androidx.compose.material", "material", androidxComposeVersion)
+  implementation("androidx.compose.ui", "ui-tooling", androidxComposeVersion)
+
+  val androidxLifecycleVersion: String by project.extra
+  implementation("androidx.lifecycle", "lifecycle-runtime-ktx", androidxLifecycleVersion)
+
+  implementation("io.coil-kt", "coil", "1.1.1")
+  implementation("dev.chrisbanes.accompanist", "accompanist-coil", "0.5.0")
+
+  testImplementation("junit", "junit", "4.13.1")
+  androidTestImplementation("androidx.test.ext", "junit", "1.1.2")
+  androidTestImplementation("androidx.test.espresso", "espresso-core", "3.3.0")
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72659f214..f7c7b9364 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="de.kuschku.quasseldroid">
 
+  <uses-feature
+    android:name="android.hardware.type.pc"
+    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.touchscreen"
+    android:required="false" />
+
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
   <application
     android:allowBackup="true"
     android:fullBackupContent="@xml/backup_descriptor"
diff --git a/build.gradle.kts b/build.gradle.kts
index 8380a4335..a366db222 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,18 +20,25 @@
 buildscript {
   repositories {
     google()
+    mavenCentral()
     jcenter()
   }
   dependencies {
     classpath("com.android.tools.build:gradle:7.0.0-alpha05")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21-2")
   }
 }
 
 allprojects {
-  extra["composeVersion"] = "1.0.0-alpha08"
+  extra["androidxAppcompatVersion"] = "1.2.0"
+  extra["androidxCoreVersion"] = "1.2.0"
+  extra["androidxComposeVersion"] = "1.0.0-alpha11"
+  extra["androidxLifecycleVersion"] = "2.3.0-rc01"
+  extra["mdcVersion"] = "1.2.1"
+
   repositories {
     google()
+    mavenCentral()
     jcenter()
   }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 0587ee4b0..cd1f563ef 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -32,7 +32,7 @@ repositories {
 
 dependencies {
   implementation("com.android.tools.build:gradle:7.0.0-alpha05")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21-2")
   implementation(gradleApi())
   implementation(localGroovy())
 }
-- 
GitLab