Skip to content

Commit

Permalink
Update dependencies and improve setup
Browse files Browse the repository at this point in the history
  • Loading branch information
rubengees committed Dec 19, 2020
1 parent 4ce5f4f commit 08bb46a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ android {
}

packagingOptions {
jniLibs {
useLegacyPackaging false
}

exclude "META-INF/*.kotlin_module"
exclude "META-INF/*.version"
exclude "META-INF/rxkotlin.properties"
Expand Down
1 change: 1 addition & 0 deletions config/lint/lint.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- Disable checks not working properly. -->
<issue id="IconExpectedSize" severity="ignore" />
<issue id="NullSafeMutableLiveData" severity="ignore" />
<issue id="UnpackedNativeCode" severity="ignore" />

<!-- Ignore errors about packages not contained in Android. These are safe. -->
<issue id="InvalidPackage" severity="error">
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8
org.gradle.unsafe.watch-fs=true
org.gradle.vfs.watch=true
org.gradle.parallel=true
org.gradle.caching=true

Expand Down
10 changes: 5 additions & 5 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ ext {
javaVersion = JavaVersion.VERSION_1_8

// Gradle
gradleVersion = "6.8-rc-1"
gradleVersion = "6.8-rc-3"

// Core plugins
androidPluginVersion = "4.2.0-beta02"
kotlinVersion = "1.4.21"

// Utility plugins
versionsPluginVersion = "0.36.0"
detektPluginVersion = "1.14.1"
detektPluginVersion = "1.15.0"
ktlintPluginVersion = "9.4.1"
ktlintVersion = "0.40.0"

// Frameworks and compatibility libraries
koinVersion = "2.2.0"
koinVersion = "2.2.1"
appcompatVersion = "1.3.0-alpha02"
browserVersion = "1.3.0"
lifecycleVersion = "2.2.0"
roomVersion = "2.3.0-alpha03"
workVersion = "2.5.0-beta02"
coreKtxVersion = "1.5.0-alpha05"
fragmentKtxVersion = "1.3.0-beta02"
fragmentKtxVersion = "1.3.0-rc01"
shareTargetVersion = "1.1.0-rc01"
securityCryptoVersion = "1.1.0-alpha03"
playCoreVersion = "1.9.0"
Expand Down Expand Up @@ -62,7 +62,7 @@ ext {
supportPreferenceVersion = "6d5ebc7934"
iconicsVersion = "5.2.1"
communityMaterialTypefaceVersion = "5.8.55.0-kotlin"
materialDrawerVersion = "8.2.0"
materialDrawerVersion = "8.3.0"
aboutLibrariesVersion = "8.6.3"
crossfaderVersion = "1.6.0"
materialAboutVersion = "3.2.0-rc01"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
android:name=".MainApplication"
android:allowBackup="true"
android:appCategory="social"
android:extractNativeLibs="false"
android:fullBackupContent="@xml/backup_config"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
Expand Down

0 comments on commit 08bb46a

Please sign in to comment.