From b8368380959f84a3708f2fda3522095e22fa70b5 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 3 Feb 2021 15:20:16 +0400 Subject: [PATCH] Updated libraries and gradle --- .idea/caches/build_file_checksums.ser | Bin 544 -> 544 bytes .idea/compiler.xml | 6 + .idea/gradle.xml | 4 + .idea/jarRepositories.xml | 30 ++++ .idea/misc.xml | 2 +- .../build_file_checksums.ser | Bin 0 -> 544 bytes .../shelved.patch | 167 ++++++++++++++++++ ...at_2_3_21_3_17_PM__Default_Changelist_.xml | 9 + abstractMvp/build.gradle | 4 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 11 files changed, 223 insertions(+), 7 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM_[Default_Changelist]/build_file_checksums.ser create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM_[Default_Changelist]/shelved.patch create mode 100644 .idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM__Default_Changelist_.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1448d5e3c81eaa84ce514213d5a59ce8e6f0a245..32b2571b60b43f995f215c3c07bac4c9eef9ab2e 100644 GIT binary patch delta 60 zcmV-C0K@;F1fT?vmj!ocmg*ysoU0QmRanv>*WIZVa=$@jbW0?301T5c0TvKSp@H|? S`3huB8ybESiya7)fB~TF2Nzrb delta 60 zcmV-C0K@;F1fT?vmj!P;qfVOF|dhexl01T5c0TvL4_8Y~} SEKwedBYxAQGeNSGfB~RflpBu# diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 14f4363..b7c6f46 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,11 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..e34606c --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 51fa3e5..197c30e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM_[Default_Changelist]/build_file_checksums.ser b/.idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM_[Default_Changelist]/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..32b2571b60b43f995f215c3c07bac4c9eef9ab2e GIT binary patch literal 544 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7apply plugin: 'com.android.library'\napply plugin: 'kotlin-android'\n\nandroid {\n compileSdkVersion 28\n\n defaultConfig {\n minSdkVersion 14\n targetSdkVersion 28\n versionCode 1\n versionName \"1.0.5\"\n }\n\n buildTypes {\n release {\n minifyEnabled false\n proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'\n }\n }\n\n}\n\ndependencies {\n implementation fileTree(dir: 'libs', include: ['*.jar'])\n implementation \"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version\"\n}\n\nrepositories {\n mavenCentral()\n}\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- abstractMvp/build.gradle (revision c3e1dc26bf76e4857ce96aa9db252eb569943037) ++++ abstractMvp/build.gradle (date 1612350616000) +@@ -2,11 +2,11 @@ + apply plugin: 'kotlin-android' + + android { +- compileSdkVersion 28 ++ compileSdkVersion 30 + + defaultConfig { + minSdkVersion 14 +- targetSdkVersion 28 ++ targetSdkVersion 30 + versionCode 1 + versionName "1.0.5" + } +Index: build.gradle +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>// Top-level build file where you can add configuration options common to all sub-projects/modules.\n\nbuildscript {\n ext.kotlin_version = '1.3.21'\n repositories {\n google()\n jcenter()\n }\n dependencies {\n classpath 'com.android.tools.build:gradle:3.4.0'\n classpath \"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version\"\n\n // NOTE: Do not place your application dependencies here; they belong\n // in the individual module build.gradle files\n }\n}\n\nallprojects {\n repositories {\n google()\n jcenter()\n }\n}\n\ntask clean(type: Delete) {\n delete rootProject.buildDir\n}\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- build.gradle (revision c3e1dc26bf76e4857ce96aa9db252eb569943037) ++++ build.gradle (date 1612350660000) +@@ -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.3.21' ++ ext.kotlin_version = '1.4.21' + repositories { + google() + jcenter() + } + dependencies { +- classpath 'com.android.tools.build:gradle:3.4.0' ++ classpath 'com.android.tools.build:gradle:4.1.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong +Index: .idea/compiler.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- .idea/compiler.xml (date 1612350585000) ++++ .idea/compiler.xml (date 1612350585000) +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/gradle.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- .idea/gradle.xml (revision c3e1dc26bf76e4857ce96aa9db252eb569943037) ++++ .idea/gradle.xml (date 1612350585000) +@@ -1,8 +1,11 @@ + + ++ + + + +Index: .idea/misc.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- .idea/misc.xml (revision c3e1dc26bf76e4857ce96aa9db252eb569943037) ++++ .idea/misc.xml (date 1612350585000) +@@ -35,7 +35,7 @@ + + + +- ++ + + + +Index: .idea/jarRepositories.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- .idea/jarRepositories.xml (date 1612350617000) ++++ .idea/jarRepositories.xml (date 1612350617000) +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: gradle/wrapper/gradle-wrapper.properties +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>#Mon Apr 22 14:49:42 AMT 2019\ndistributionBase=GRADLE_USER_HOME\ndistributionPath=wrapper/dists\nzipStoreBase=GRADLE_USER_HOME\nzipStorePath=wrapper/dists\ndistributionUrl=https\\://services.gradle.org/distributions/gradle-5.1.1-all.zip\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- gradle/wrapper/gradle-wrapper.properties (revision c3e1dc26bf76e4857ce96aa9db252eb569943037) ++++ gradle/wrapper/gradle-wrapper.properties (date 1612350669000) +@@ -1,6 +1,6 @@ +-#Mon Apr 22 14:49:42 AMT 2019 ++#Wed Feb 03 15:11:09 AMT 2021 + distributionBase=GRADLE_USER_HOME + distributionPath=wrapper/dists + zipStoreBase=GRADLE_USER_HOME + zipStorePath=wrapper/dists +-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip ++distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM__Default_Changelist_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM__Default_Changelist_.xml new file mode 100644 index 0000000..b4ed14f --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_2_3_21_3_17_PM__Default_Changelist_.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/abstractMvp/build.gradle b/abstractMvp/build.gradle index 15d67b8..49b4cab 100644 --- a/abstractMvp/build.gradle +++ b/abstractMvp/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 30 versionCode 1 versionName "1.0.5" } diff --git a/build.gradle b/build.gradle index 44a7d52..b0d94e7 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.3.21' + ext.kotlin_version = '1.4.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 934782c..417d7c9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 22 14:49:42 AMT 2019 +#Wed Feb 03 15:11:09 AMT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip