Fix compilation issues

This also deletes the unused time-android module.
Meesho · May 27, 2022 · 3324ab0 · 3324ab0
1 parent 8dbb554
commit 3324ab0
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 92 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.2.60'
+    ext.kotlin_version = '1.5.10'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.palantir:jacoco-coverage:0.4.0'
     }
 }
 
@@ -19,5 +17,3 @@ allprojects {
         jcenter()
     }
 }
-
-apply plugin: 'com.palantir.jacoco-full-report'
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-4.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,3 @@
-include ':time', ':time-android'
+include ':time'
 rootProject.name = 'Time'
 
diff --git a/time-android/.gitignore b/time-android/.gitignore
diff --git a/time-android/build.gradle b/time-android/build.gradle
diff --git a/time-android/proguard-rules.pro b/time-android/proguard-rules.pro
diff --git a/time-android/src/main/AndroidManifest.xml b/time-android/src/main/AndroidManifest.xml
diff --git a/time-android/src/main/kotlin/com/kizitonwose/timeandroid/AndroidExtensions.kt b/time-android/src/main/kotlin/com/kizitonwose/timeandroid/AndroidExtensions.kt
diff --git a/time-android/src/main/res/values/strings.xml b/time-android/src/main/res/values/strings.xml
diff --git a/time/build.gradle b/time/build.gradle
@@ -1,6 +1,4 @@
 apply plugin: 'kotlin'
-apply plugin: 'maven'
-apply plugin: 'jacoco'
 
 group = 'com.github.kizitonwose'
 
@@ -13,8 +11,8 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.6"
+    kotlinOptions.jvmTarget = "1.8"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.6"
+    kotlinOptions.jvmTarget = "1.8"
 }