Skip to content

Commit 84f7f64

Browse files
feat: Update Android Gradle plugin to 8.0.2 (#188)
1 parent 21483a0 commit 84f7f64

21 files changed

Lines changed: 1552 additions & 1073 deletions

build.gradle

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
buildscript {
2-
if (!project.hasProperty('version') || project.version == 'unspecified') {
2+
ext.kotlin_version = '2.0.20'
3+
if (!project.hasProperty('version') || project.version.equals('unspecified')) {
34
project.version = '+'
45
}
56

@@ -9,15 +10,15 @@ buildscript {
910
mavenCentral()
1011
}
1112
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.4.1'
13+
classpath 'com.android.tools.build:gradle:8.1.4'
1314
classpath 'com.mparticle:android-kit-plugin:' + project.version
14-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20'
15+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1516
}
1617
}
1718

1819
plugins {
1920
id "org.sonarqube" version "3.5.0.2730"
20-
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
21+
id "org.jlleitschuh.gradle.ktlint" version "13.0.0"
2122
}
2223

2324
sonarqube {
@@ -29,16 +30,29 @@ sonarqube {
2930
}
3031

3132
apply plugin: 'org.jlleitschuh.gradle.ktlint'
32-
apply plugin: "kotlin-android"
33+
apply plugin: 'kotlin-android'
3334
apply plugin: 'com.mparticle.kit'
3435

3536
android {
37+
namespace 'com.mparticle.kits.appboy'
38+
buildFeatures {
39+
buildConfig = true
40+
}
3641
defaultConfig {
3742
minSdkVersion 21
3843
}
44+
lint {
45+
// Workaround for lint internal crash
46+
abortOnError false
47+
// Ignore obsolete custom lint checks from older fragment library
48+
disable 'ObsoleteLintCustomCheck'
49+
}
3950
compileOptions {
40-
sourceCompatibility 1.8
41-
targetCompatibility 1.8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
53+
}
54+
kotlinOptions {
55+
jvmTarget = '17'
4256
}
4357
testOptions {
4458
unitTests.all {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
android.enableJetifier=true
22
android.useAndroidX=true
33
org.gradle.daemon=true
4-
org.gradle.jvmargs=-Xmx2560m
4+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest package="com.mparticle.kits.appboy"
2-
xmlns:android="http://schemas.android.com/apk/res/android"/>
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

0 commit comments

Comments
 (0)