chore: upgrading kotlin and gradle

alarangeiras · Apr 13, 2022 · 98fc063 · 98fc063
1 parent 8c20e25
commit 98fc063
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 21 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
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/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
     }
     buildTypes {
         debug {
-            buildConfigField "String", "ORAMA_BASE_URL", "\"https://mocks-alarangeiras.herokuapp.com/orama/\""
+            buildConfigField "String", "ORAMA_BASE_URL", "\"https://asl-orama.free.mockoapp.net/\""
         }
         release {
             buildConfigField "String", "ORAMA_BASE_URL", "\"https://s3.amazonaws.com/orama-media/\""
@@ -45,4 +45,4 @@ dependencies {
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
-}
+}
diff --git a/app/src/main/res/layout/include_app_bar.xml b/app/src/main/res/layout/include_app_bar.xml
@@ -2,12 +2,14 @@
 <app:android.support.v7.widget.Toolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/toolbar"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@color/colorPrimary"
         android:gravity="center_vertical"
         app:layout_collapseMode="pin"
         app:layout_scrollFlags="scroll|enterAlways"
-        app:theme="@style/ToolbarTheme"
-        app:title="@string/app_name"/>
+        android:theme="@style/ToolbarTheme"
+        app:title="@string/app_name"
+    tools:ignore="MissingClass" />
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 // 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.3.40'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ 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-7.2-all.zip