From 64088ed08d45df1808dc8e84cd9b84133973dcba Mon Sep 17 00:00:00 2001 From: Maxim Firsov Date: Thu, 9 Sep 2021 09:45:02 +0500 Subject: [PATCH 1/2] idea --- .gitignore | 12 +++++------- .idea/codeStyles/Project.xml | 29 ----------------------------- .idea/encodings.xml | 6 ------ .idea/misc.xml | 34 ---------------------------------- .idea/modules.xml | 18 ------------------ .idea/runConfigurations.xml | 12 ------------ .idea/vcs.xml | 6 ------ 7 files changed, 5 insertions(+), 112 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 39b6783..1ee80a8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,13 +34,11 @@ captures/ # IntelliJ *.iml -.idea/workspace.xml -.idea/tasks.xml -.idea/gradle.xml -.idea/assetWizardSettings.xml -.idea/dictionaries -.idea/libraries -.idea/caches +.idea/ + +# MacOS +**/.DS_Store + # Keystore files # Uncomment the following line if you do not want to check your keystore files in. diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f6e0e04..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7e14ffb..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 32ffce4c4002d3ff4c3db90d51a8b2f2d5b5e66c Mon Sep 17 00:00:00 2001 From: Maxim Firsov Date: Thu, 9 Sep 2021 09:46:09 +0500 Subject: [PATCH 2/2] updated versions of Gradle, Kotlin, Dagger --- app/build.gradle | 9 +++++++-- build.gradle | 9 +++++++-- celebrity-hidden-userapi/build.gradle | 2 -- celebrity-timelogic/build.gradle | 2 -- celebrity-timelogic/timelogic-api/build.gradle | 2 -- .../timelogic-implementation/build.gradle | 6 ++---- celebrity-timeview/build.gradle | 2 -- celebrity-timeview/timeview-sample/build.gradle | 4 ++-- common/build.gradle | 2 -- feature-startscreen/build.gradle | 6 ++---- feature-userscreen/build.gradle | 7 ++----- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 13 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d9e525f..8263703 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,6 +19,11 @@ android { preDexLibraries true incremental true } + + compileOptions { + sourceCompatibility project.versions.javaVersion + targetCompatibility project.versions.javaVersion + } } dependencies { @@ -31,8 +36,8 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.google.dagger:dagger:2.16' - kapt 'com.google.dagger:dagger-compiler:2.16' + implementation "com.google.dagger:dagger:${versions.dagger}" + kapt "com.google.dagger:dagger-compiler:${versions.dagger}" implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' } diff --git a/build.gradle b/build.gradle index ea2c2e0..7420767 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.5.30' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -22,3 +22,8 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } + +ext.versions = [ + dagger : '2.38.1', + javaVersion : JavaVersion.VERSION_1_8 +] diff --git a/celebrity-hidden-userapi/build.gradle b/celebrity-hidden-userapi/build.gradle index afcf46d..27b5f63 100644 --- a/celebrity-hidden-userapi/build.gradle +++ b/celebrity-hidden-userapi/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } diff --git a/celebrity-timelogic/build.gradle b/celebrity-timelogic/build.gradle index ecb15f8..aca157b 100644 --- a/celebrity-timelogic/build.gradle +++ b/celebrity-timelogic/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } diff --git a/celebrity-timelogic/timelogic-api/build.gradle b/celebrity-timelogic/timelogic-api/build.gradle index 5b176d8..d34d620 100644 --- a/celebrity-timelogic/timelogic-api/build.gradle +++ b/celebrity-timelogic/timelogic-api/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } diff --git a/celebrity-timelogic/timelogic-implementation/build.gradle b/celebrity-timelogic/timelogic-implementation/build.gradle index 3082f0b..a4250ee 100644 --- a/celebrity-timelogic/timelogic-implementation/build.gradle +++ b/celebrity-timelogic/timelogic-implementation/build.gradle @@ -10,8 +10,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } @@ -20,6 +18,6 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.google.dagger:dagger:2.16' - kapt 'com.google.dagger:dagger-compiler:2.16' + implementation "com.google.dagger:dagger:${versions.dagger}" + kapt "com.google.dagger:dagger-compiler:${versions.dagger}" } \ No newline at end of file diff --git a/celebrity-timeview/build.gradle b/celebrity-timeview/build.gradle index 5766892..3143598 100644 --- a/celebrity-timeview/build.gradle +++ b/celebrity-timeview/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } diff --git a/celebrity-timeview/timeview-sample/build.gradle b/celebrity-timeview/timeview-sample/build.gradle index be52abe..097faf8 100644 --- a/celebrity-timeview/timeview-sample/build.gradle +++ b/celebrity-timeview/timeview-sample/build.gradle @@ -22,8 +22,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.google.dagger:dagger:2.16' - kapt 'com.google.dagger:dagger-compiler:2.16' + implementation "com.google.dagger:dagger:${versions.dagger}" + kapt "com.google.dagger:dagger-compiler:${versions.dagger}" implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' } diff --git a/common/build.gradle b/common/build.gradle index 2525ae7..73a307c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,8 +7,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } diff --git a/feature-startscreen/build.gradle b/feature-startscreen/build.gradle index 5cd1c2e..fe520e8 100644 --- a/feature-startscreen/build.gradle +++ b/feature-startscreen/build.gradle @@ -10,8 +10,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } @@ -22,8 +20,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.google.dagger:dagger:2.16' - kapt 'com.google.dagger:dagger-compiler:2.16' + implementation "com.google.dagger:dagger:${versions.dagger}" + kapt "com.google.dagger:dagger-compiler:${versions.dagger}" implementation 'io.reactivex.rxjava2:rxjava:2.1.15' implementation 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.1.1' diff --git a/feature-userscreen/build.gradle b/feature-userscreen/build.gradle index b51f223..67e6ccd 100644 --- a/feature-userscreen/build.gradle +++ b/feature-userscreen/build.gradle @@ -10,8 +10,6 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 27 - versionCode 1 - versionName "1.0" } } @@ -24,9 +22,8 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.1.1' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.google.dagger:dagger:2.16' - - kapt 'com.google.dagger:dagger-compiler:2.16' + implementation "com.google.dagger:dagger:${versions.dagger}" + kapt "com.google.dagger:dagger-compiler:${versions.dagger}" implementation 'io.reactivex.rxjava2:rxjava:2.1.15' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' diff --git a/gradle.properties b/gradle.properties index 824904c..8bc1edc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ org.gradle.parallel=true org.gradle.daemon=true org.gradle.jvmargs=-Xms2048M -Xmx4096M -XX:MaxPermSize=3072m -XX:-UseGCOverheadLimit org.gradle.caching=true -android.enableBuildCache=true +#android.enableBuildCache=true kotlin.incremental.usePreciseJavaTracking=true # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d80b69..0f80bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists