update gradle

jignesh13 · Feb 28, 2021 · 77fc185 · 77fc185
1 parent 86baa22
commit 77fc185
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 15 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'joda-time:joda-time:2.10.2'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.gjiazhe:scrollparallaximageview:1.0'

diff --git a/app/src/main/java/com/example/GoogleCalendar/MyRecyclerVIew.kt b/app/src/main/java/com/example/GoogleCalendar/MyRecyclerVIew.kt
@@ -107,11 +107,14 @@ class MyRecyclerView @JvmOverloads constructor(context: Context, attrs: Attribut
     }
 
 
-
-    override fun setLayoutManager(layout: RecyclerView.LayoutManager) {
+    override fun setLayoutManager(layout: LayoutManager?) {
         super.setLayoutManager(layout)
         mLayoutManager = layoutManager as LinearLayoutManager
     }
+//     fun setLayoutManager(layout: LayoutManager) {
+//        super.setLayoutManager(layout)
+//        mLayoutManager = layoutManager as LinearLayoutManager
+//    }
 
     fun setAppBarTracking(appBarTracking: AppBarTracking) {
         mAppBarTracking = appBarTracking

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,6 @@
             android:id="@+id/collapsingToolbarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways"
             app:statusBarScrim="?attr/colorPrimaryDark">
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         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
@@ -1,6 +1,6 @@
-#Sat Jun 15 17:16:50 IST 2019
+#Sun Feb 28 09:52:34 IST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip