Update Gradle

This commit is contained in:
Jonas Lochmann 2023-04-10 02:00:00 +02:00
parent fb479083bf
commit 66496eb96f
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
6 changed files with 10 additions and 14 deletions

View file

@ -22,6 +22,7 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'com.squareup.wire'
android {
namespace 'io.timelimit.android'
compileSdkVersion 33
defaultConfig {
applicationId "io.timelimit.android"
@ -145,12 +146,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
composeOptions {

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
TimeLimit Copyright <C> 2019 - 2022 Jonas Lochmann
TimeLimit Copyright <C> 2019 - 2023 Jonas Lochmann
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 3 of the License.
@ -14,8 +14,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="io.timelimit.android">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />

View file

@ -405,7 +405,7 @@ class EditTimeLimitRuleDialogFragment : BottomSheetDialogFragment() {
// from https://stackoverflow.com/a/43602359
dialog.setOnShowListener {
BottomSheetBehavior.from(
dialog.findViewById<View>(R.id.design_bottom_sheet)
dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
).setState(BottomSheetBehavior.STATE_EXPANDED)
}

View file

@ -23,7 +23,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
classpath 'com.squareup.wire:wire-gradle-plugin:4.4.3'

View file

@ -6,8 +6,8 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
org.gradle.jvmargs=-Xmx2048m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit

View file

@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01