github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Gradle] Update libraries and dependencies.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-02-17 14:42:08 +01:00
parent ed3a245b51
commit 9649afd43f
9 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/codeStyles/Project.xml
View File

@ -1,6 +1,10 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions> </indentOptions>
@ -11,7 +15,6 @@
<match> <match>
<AND> <AND>
<NAME>xmlns:android</NAME> <NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE> <XML_NAMESPACE>^$</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -22,7 +25,6 @@
<match> <match>
<AND> <AND>
<NAME>xmlns:.*</NAME> <NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE> <XML_NAMESPACE>^$</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -34,7 +36,6 @@
<match> <match>
<AND> <AND>
<NAME>.*:id</NAME> <NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -45,7 +46,6 @@
<match> <match>
<AND> <AND>
<NAME>.*:name</NAME> <NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -56,7 +56,6 @@
<match> <match>
<AND> <AND>
<NAME>name</NAME> <NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE> <XML_NAMESPACE>^$</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -67,7 +66,6 @@
<match> <match>
<AND> <AND>
<NAME>style</NAME> <NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE> <XML_NAMESPACE>^$</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -78,7 +76,6 @@
<match> <match>
<AND> <AND>
<NAME>.*</NAME> <NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE> <XML_NAMESPACE>^$</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -90,7 +87,6 @@
<match> <match>
<AND> <AND>
<NAME>.*</NAME> <NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -102,7 +98,6 @@
<match> <match>
<AND> <AND>
<NAME>.*</NAME> <NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE> <XML_NAMESPACE>.*</XML_NAMESPACE>
</AND> </AND>
</match> </match>
@ -112,5 +107,8 @@
</rules> </rules>
</arrangement> </arrangement>
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

5
.idea/codeStyles/codeStyleConfig.xml Normal file
View File

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

16
.idea/compiler.xml
View File

@ -4,14 +4,14 @@
<bytecodeTargetLevel target="1.7"> <bytecodeTargetLevel target="1.7">
<module name="annotation" target="1.7" /> <module name="annotation" target="1.7" />
<module name="codegen" target="1.7" /> <module name="codegen" target="1.7" />
<module name="Szkolny.eu.agendacalendarview" target="1.8" /> <module name="Szkolny.eu.agendacalendarview" target="11" />
<module name="Szkolny.eu.app" target="1.8" /> <module name="Szkolny.eu.app" target="11" />
<module name="Szkolny.eu.cafebar" target="1.8" /> <module name="Szkolny.eu.cafebar" target="11" />
<module name="Szkolny.eu.material-about-library" target="1.8" /> <module name="Szkolny.eu.material-about-library" target="11" />
<module name="Szkolny.eu.mhttp" target="1.8" /> <module name="Szkolny.eu.mhttp" target="11" />
<module name="Szkolny.eu.nachos" target="1.8" /> <module name="Szkolny.eu.nachos" target="11" />
<module name="Szkolny.eu.szkolny-font" target="1.8" /> <module name="Szkolny.eu.szkolny-font" target="11" />
<module name="Szkolny.eu.wear" target="1.8" /> <module name="Szkolny.eu.wear" target="11" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
</project> </project>

2
.idea/discord.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DiscordProjectSettings"> <component name="DiscordProjectSettings">
<option name="show" value="true" /> <option name="show" value="PROJECT_FILES" />
</component> </component>
<component name="ProjectNotificationSettings"> <component name="ProjectNotificationSettings">
<option name="askShowProject" value="false" /> <option name="askShowProject" value="false" />

1
.idea/runConfigurations.xml
View File

@ -3,6 +3,7 @@
<component name="RunConfigurationProducerService"> <component name="RunConfigurationProducerService">
<option name="ignoredProducers"> <option name="ignoredProducers">
<set> <set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />

13
app/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric' apply plugin: 'com.google.firebase.crashlytics'
android { android {
signingConfigs { signingConfigs {
@ -54,8 +54,8 @@ android {
lintOptions { lintOptions {
checkReleaseBuilds false checkReleaseBuilds false
} }
dataBinding { buildFeatures {
enabled = true dataBinding = true
} }
compileOptions { compileOptions {
sourceCompatibility '1.8' sourceCompatibility '1.8'
@ -75,6 +75,7 @@ android {
version "3.10.2" version "3.10.2"
} }
} }
ndkVersion '21.3.6528147'
} }
/*task finalizeBundleDebug(type: Copy) { /*task finalizeBundleDebug(type: Copy) {
@ -114,7 +115,7 @@ dependencies {
implementation "androidx.core:core-ktx:${versions.ktx}" implementation "androidx.core:core-ktx:${versions.ktx}"
implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}" implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}"
implementation "androidx.legacy:legacy-support-v4:${versions.legacy}" implementation "androidx.legacy:legacy-support-v4:${versions.legacy}"
implementation "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}" implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}"
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}" implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
implementation "androidx.room:room-runtime:${versions.room}" implementation "androidx.room:room-runtime:${versions.room}"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
@ -137,7 +138,7 @@ dependencies {
implementation "cat.ereza:customactivityoncrash:2.2.0" implementation "cat.ereza:customactivityoncrash:2.2.0"
implementation "com.applandeo:material-calendar-view:1.5.0" implementation "com.applandeo:material-calendar-view:1.5.0"
implementation "com.crashlytics.sdk.android:crashlytics:2.10.1" implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
implementation "com.daimajia.swipelayout:library:1.2.0@aar" implementation "com.daimajia.swipelayout:library:1.2.0@aar"
implementation "com.evernote:android-job:1.2.6" implementation "com.evernote:android-job:1.2.6"
implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2" implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2"
@ -157,7 +158,7 @@ dependencies {
implementation "me.grantland:autofittextview:0.2.1" implementation "me.grantland:autofittextview:0.2.1"
implementation "me.leolin:ShortcutBadger:1.1.22@aar" implementation "me.leolin:ShortcutBadger:1.1.22@aar"
implementation "org.greenrobot:eventbus:3.1.1" implementation "org.greenrobot:eventbus:3.1.1"
implementation "org.jsoup:jsoup:1.10.1" implementation "org.jsoup:jsoup:1.12.1"
implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15" implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15"
//implementation "se.emilsjolander:stickylistheaders:2.7.0" //implementation "se.emilsjolander:stickylistheaders:2.7.0"
implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar' implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar'

32
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.3.61' kotlin_version = '1.4.30'
release = [ release = [
versionName: "4.4.3", versionName: "4.4.3",
@ -17,28 +17,28 @@ buildscript {
] ]
versions = [ versions = [
gradleAndroid : '4.1.0-rc01', gradleAndroid : '4.2.0-beta04',
kotlin : ext.kotlin_version, kotlin : ext.kotlin_version,
ktx : "1.2.0", ktx : "1.3.2",
androidX : '1.0.0', androidX : '1.0.0',
annotation : '1.1.0', annotation : '1.1.0',
recyclerView : '1.2.0-alpha01', recyclerView : '1.2.0-beta01',
material : '1.2.0-alpha05', material : '1.3.0',
appcompat : '1.2.0-alpha02', appcompat : '1.3.0-beta01',
constraintLayout : '2.0.0-beta4', constraintLayout : '2.1.0-alpha2',
cardview : '1.0.0', cardview : '1.0.0',
gridLayout : '1.0.0', gridLayout : '1.0.0',
navigation : "2.0.0", navigation : "2.0.0",
navigationFragment: "1.0.0", navigationFragment: "1.0.0",
legacy : "1.0.0", legacy : "1.0.0",
room : "2.2.5", room : "2.2.6",
lifecycle : "2.2.0", lifecycle : "2.3.0",
work : "2.3.4", work : "2.5.0",
firebase : '17.2.2', firebase : '18.0.2',
firebasemessaging: "20.1.3", firebasemessaging: "20.1.3",
play_services : "17.0.0", play_services : "17.0.0",
@ -58,9 +58,6 @@ buildscript {
} }
repositories { repositories {
maven {
url 'https://maven.fabric.io/public'
}
google() google()
jcenter() jcenter()
} }
@ -68,11 +65,8 @@ buildscript {
classpath "com.android.tools.build:gradle:${versions.gradleAndroid}" classpath "com.android.tools.build:gradle:${versions.gradleAndroid}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath 'me.tatarka:gradle-retrolambda:3.7.0' classpath 'me.tatarka:gradle-retrolambda:3.7.0'
classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.gms:google-services:4.3.5'
classpath 'io.fabric.tools:gradle:1.28.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
} }
} }

1
gradle.properties
View File

@ -9,7 +9,6 @@
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
android.enableR8=true
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Aug 24 17:15:24 CEST 2020 #Wed Feb 17 14:04:38 CET 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME