From b457ed757101e229db7c4b8b8f1631474b24d2a2 Mon Sep 17 00:00:00 2001
From: Taco <SkytkRSfan3895@gmail.com>
Date: Thu, 20 Dec 2018 16:46:56 -0500
Subject: [PATCH] Update some dependencies and add some androidx deps
Signed-off-by: Taco <SkytkRSfan3895@gmail.com>
---
app/build.gradle | 28 ++++++++++++++----------
build.gradle | 9 ++++----
gradle/wrapper/gradle-wrapper.properties | 3 +--
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 0d7d407..044dfdf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,6 +6,7 @@ apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 28
+ buildToolsVersion '28.0.3'
defaultConfig {
applicationId "eu.depau.etchdroid"
minSdkVersion 19
@@ -21,28 +22,33 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ compileOptions {
+ encoding = 'UTF-8'
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
- implementation 'com.google.android.material:material:1.0.0'
- implementation 'androidx.recyclerview:recyclerview:1.0.0'
+ implementation 'com.google.android.material:material:1.1.0-alpha02'
+ implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
- api 'com.google.guava:guava:26.0-android'
+ implementation 'androidx.core:core:1.1.0-alpha03'
+ implementation 'androidx.fragment:fragment:1.1.0-alpha03'
+ implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha01'
+ api 'com.google.guava:guava:27.0.1-android'
api 'com.github.codekidX:storage-chooser:2.0.4.2'
// implementation 'com.github.mjdev:libaums:0.5.5'
implementation project(':libaums')
implementation project(':dmg2img')
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'com.android.support:design:28.0.0'
- implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'me.jfenn:Attribouter:0.1.5'
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+ testImplementation 'junit:junit:4.13-beta-1'
+ androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
}
diff --git a/build.gradle b/build.gradle
index e0d04f0..a1c567b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,24 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.2.71'
+ ext.kotlin_version = '1.3.11'
repositories {
- google()
jcenter()
+ google()
+ maven { url "https://jitpack.io" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// For libaums
- classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
allprojects {
repositories {
- google()
jcenter()
+ google()
maven { url "https://jitpack.io" }
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a7975c5..0682df5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Sep 29 19:40:07 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip