diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..e1bef7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/simple-kit/build.gradle b/simple-kit/build.gradle index 4ad702e..1cf507d 100644 --- a/simple-kit/build.gradle +++ b/simple-kit/build.gradle @@ -1,22 +1,25 @@ - buildscript { + ext.kotlin_version = '2.0.20' if (!project.hasProperty('version') || project.version.equals('unspecified')) { project.version = '+' } + repositories { google() mavenLocal() mavenCentral() } + dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.1.4' classpath 'com.mparticle:android-kit-plugin:' + project.version + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } plugins { id "org.sonarqube" version "3.5.0.2730" - id "org.jlleitschuh.gradle.ktlint" version "11.2.0" + id "org.jlleitschuh.gradle.ktlint" version "13.0.0" } sonarqube { @@ -28,8 +31,28 @@ sonarqube { } apply plugin: 'org.jlleitschuh.gradle.ktlint' +apply plugin: 'kotlin-android' apply plugin: 'com.mparticle.kit' +android { + namespace 'com.mparticle.kits.example' + defaultConfig { + minSdkVersion 21 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = '17' + } + testOptions { + unitTests.all { + jvmArgs += ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] + } + } +} + dependencies { //TODO: Option 1: Replace with your Maven Central Dependency (preferred) //compile 'com.example:example-artifact:1.2.3' diff --git a/simple-kit/src/main/AndroidManifest.xml b/simple-kit/src/main/AndroidManifest.xml index 28b3b74..541c199 100644 --- a/simple-kit/src/main/AndroidManifest.xml +++ b/simple-kit/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - +