From 6486230cac4fad42f8786a63bea5151c7247e9e3 Mon Sep 17 00:00:00 2001 From: MasahiroKitazoe Date: Thu, 4 Jan 2024 16:10:20 +0900 Subject: [PATCH] add namespace and target java versions to upgrade to AGP 8 --- packages/health/android/build.gradle | 14 ++++++++++++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/health/android/build.gradle b/packages/health/android/build.gradle index c8f9e4e0e..48d6167f3 100644 --- a/packages/health/android/build.gradle +++ b/packages/health/android/build.gradle @@ -2,14 +2,14 @@ group 'cachet.plugins.health' version '1.2' buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.9.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -27,6 +27,15 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 34 + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -38,6 +47,7 @@ android { lintOptions { disable 'InvalidPackage' } + namespace "cachet.plugins.health" } dependencies { diff --git a/packages/health/android/gradle/wrapper/gradle-wrapper.properties b/packages/health/android/gradle/wrapper/gradle-wrapper.properties index 856da69bc..a59520664 100644 --- a/packages/health/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/health/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists