Update gradle and kotlin plugins

This commit is contained in:
Shinokuni 2023-02-20 19:13:06 +01:00
parent 8a5fae5411
commit 55d982dd22
11 changed files with 21 additions and 23 deletions

View File

@ -12,9 +12,6 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
abortOnError false
}
sourceSets {
androidTest.assets.srcDirs += files("$projectDir/androidTest/assets".toString())
@ -39,6 +36,10 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
lint {
abortOnError false
}
namespace 'com.readrops.api'
}
dependencies {

View File

@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.readrops.api">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- for tests only -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

View File

@ -1,4 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.readrops.api">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>

View File

@ -18,9 +18,6 @@ android {
testOptions {
unitTests.returnDefaultValues = true
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled true
@ -52,6 +49,10 @@ android {
viewBinding true
buildConfig true
}
lint {
abortOnError false
}
namespace 'com.readrops.app'
}
dependencies {

View File

@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.readrops.app">
xmlns:tools="http://schemas.android.com/tools">
<application
android:name=".ReadropsDebugApp"

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.readrops.app">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />

View File

@ -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.5.30'
ext.kotlin_version = '1.8.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jacoco:org.jacoco.core:0.8.7"
}

View File

@ -28,9 +28,6 @@ android {
androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
}
lintOptions {
abortOnError false
}
buildTypes {
release {
@ -52,6 +49,10 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
lint {
abortOnError false
}
namespace 'com.readrops.db'
}
// Needed for kapt starting with kotlin plugin 1.5

View File

@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.readrops.db" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

View File

@ -4,7 +4,7 @@ import androidx.room.TypeConverter
import com.readrops.db.entities.account.AccountType
import org.joda.time.LocalDateTime
object Converters {
class Converters {
@TypeConverter
fun fromTimeStamp(value: Long): LocalDateTime {

View File

@ -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-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip