diff --git a/app/build.gradle b/app/build.gradle index e44c349..2adaac5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,24 +46,24 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' - implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha01' - implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.core:core:1.2.0-rc01' - implementation 'androidx.fragment:fragment:1.2.0-rc05' - implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03' - implementation 'com.google.android.material:material:1.2.0-alpha03' - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core:1.3.0' + implementation 'androidx.fragment:fragment:1.2.5' implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.gridlayout:gridlayout:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'com.google.guava:guava:29.0-jre' implementation 'com.github.Depau:kotlet-android:v0.2.5' implementation project(':dmg2img') implementation 'me.jfenn:Attribouter:0.1.5' - implementation 'androidx.room:room-runtime:2.2.3' - kapt 'androidx.room:room-compiler:2.2.3' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'androidx.room:room-runtime:2.2.5' + kapt 'androidx.room:room-compiler:2.2.5' + implementation 'com.google.code.gson:gson:2.8.6' api 'com.github.codekidX:storage-chooser:2.0.4.2' api 'com.github.EtchDroid:libaums_wrapper:v1.1' @@ -71,7 +71,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - testImplementation 'junit:junit:4.13-beta-3' + testImplementation 'junit:junit:4.13' testImplementation 'androidx.test:core:1.2.0' testImplementation 'org.mockito:mockito-core:2.28.2' diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a0febfd..fe101df 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -192,5 +192,4 @@ Custom Converts compressed AppleĀ® DMG images LibreSSL is a fork of OpenSSL 1.0.1g developed by the OpenBSD project. - LibreSSL is a fork of OpenSSL 1.0.1g developed by the OpenBSD project. diff --git a/build.gradle b/build.gradle index a96bd62..df620f9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.3.72' repositories { jcenter() google() maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 06f1b24..8ecefb8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 02 17:55:26 CEST 2019 +#Thu Jul 02 17:02:56 YEKT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip