Skip to content

Commit 64b3434

Browse files
feat: Update Android Gradle plugin to 8.0.2 (#124)
1 parent 5adc152 commit 64b3434

7 files changed

Lines changed: 171 additions & 114 deletions

File tree

build.gradle

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.10'
2+
ext.kotlin_version = '2.0.20'
33
if (!project.hasProperty('version') || project.version.equals('unspecified')) {
44
project.version = '+'
55
}
66

77
repositories {
8+
google()
89
mavenLocal()
910
mavenCentral()
10-
google()
1111
}
12+
1213
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.4.1'
14+
classpath 'com.android.tools.build:gradle:8.1.4'
1415
classpath 'com.mparticle:android-kit-plugin:' + project.version
1516
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
16-
1717
}
1818
}
1919

2020
plugins {
2121
id "org.sonarqube" version "3.5.0.2730"
22-
id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
22+
id "org.jlleitschuh.gradle.ktlint" version "13.0.0"
2323
}
2424

2525
sonarqube {
@@ -31,8 +31,8 @@ sonarqube {
3131
}
3232

3333
apply plugin: 'org.jlleitschuh.gradle.ktlint'
34-
apply plugin: 'com.mparticle.kit'
3534
apply plugin: 'kotlin-android'
35+
apply plugin: 'com.mparticle.kit'
3636

3737
repositories {
3838
maven {
@@ -41,6 +41,28 @@ repositories {
4141
mavenCentral()
4242
}
4343

44+
android {
45+
namespace 'com.mparticle.kits.singular'
46+
buildFeatures {
47+
buildConfig = true
48+
}
49+
defaultConfig {
50+
minSdkVersion 16
51+
}
52+
compileOptions {
53+
sourceCompatibility JavaVersion.VERSION_17
54+
targetCompatibility JavaVersion.VERSION_17
55+
}
56+
kotlinOptions {
57+
jvmTarget = '17'
58+
}
59+
testOptions {
60+
unitTests.all {
61+
jvmArgs += ['--add-opens', 'java.base/java.lang=ALL-UNNAMED']
62+
}
63+
}
64+
}
65+
4466
dependencies {
4567
api 'com.singular.sdk:singular_sdk:12.5.4'
4668

@@ -53,9 +75,3 @@ dependencies {
5375
testImplementation "org.robolectric:robolectric:4.3.1"
5476
testImplementation 'org.json:json:20220320'
5577
}
56-
57-
android {
58-
defaultConfig {
59-
minSdkVersion 16
60-
}
61-
}
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-
<!-- Change 'example' below to your company name, and delete this comment. -->
2-
<manifest package="com.mparticle.kits.singular"/>
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>

0 commit comments

Comments
 (0)