diff --git a/build.gradle b/build.gradle index a1001ac..1372252 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.androidApplication apply false alias libs.plugins.androidLibrary apply false - alias libs.plugins.kotlinAndroid apply false alias libs.plugins.composeCompiler apply false alias libs.plugins.dokka apply false alias libs.plugins.mavenPublish apply false diff --git a/common.gradle b/common.gradle index 8ac933f..663d010 100644 --- a/common.gradle +++ b/common.gradle @@ -19,10 +19,6 @@ android { } } - kotlinOptions { - jvmTarget = '1.8' - } - lint { abortOnError = true warningsAsErrors = true diff --git a/dev-app/build.gradle b/dev-app/build.gradle index 46f9f27..735d319 100644 --- a/dev-app/build.gradle +++ b/dev-app/build.gradle @@ -1,6 +1,5 @@ plugins { alias libs.plugins.androidApplication - alias libs.plugins.kotlinAndroid alias libs.plugins.composeCompiler } @@ -22,7 +21,7 @@ android { minifyEnabled = true proguardFiles = [ "okhttp3-proguard-rules.txt", - getDefaultProguardFile('proguard-android.txt') + getDefaultProguardFile('proguard-android-optimize.txt') ] signingConfig = signingConfigs.debug } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5a1913..b349dbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.0" +agp = "9.0.0" kotlin = "2.1.21" core-ktx = "1.16.0" junit = "4.13.2" @@ -35,7 +35,6 @@ okhttp-core = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.12 # GMA / IMA gma-ads = { group = "com.google.android.gms", name = "play-services-ads", version.ref = "gma" } ima-ads = { group = "com.google.ads.interactivemedia.v3", name = "interactivemedia", version.ref = "ima" } -androidx-multidex = { group = "androidx.multidex", name = "multidex", version = "2.0.1" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version = "2.2.1" } androidx-media = { group = "androidx.media", name = "media", version = "1.7.0" } androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" } @@ -54,7 +53,6 @@ mockk-agent = { group = "io.mockk", name = "mockk-agent", version.ref = "mockkVe [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } androidLibrary = { id = "com.android.library", version.ref = "agp" } -kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } spotless = { id = "com.diffplug.spotless", version = "7.0.4" } dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bad7c24..19a6bde 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/prebid/build.gradle b/prebid/build.gradle index 4f52e52..af9acb3 100644 --- a/prebid/build.gradle +++ b/prebid/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidLibrary - alias libs.plugins.kotlinAndroid alias libs.plugins.dokka alias libs.plugins.mavenPublish } @@ -15,10 +16,10 @@ android { kotlin { explicitApi() - } - - kotlinOptions { - freeCompilerArgs += [ "-opt-in=com.uid2.InternalUID2Api" ] + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + optIn.add("com.uid2.InternalUID2Api") + } } } diff --git a/sdk/build.gradle b/sdk/build.gradle index f4657a0..c9931b2 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidLibrary - alias libs.plugins.kotlinAndroid alias libs.plugins.dokka alias libs.plugins.mavenPublish } @@ -29,10 +30,10 @@ android { kotlin { explicitApi() - } - - kotlinOptions { - freeCompilerArgs += [ "-opt-in=com.uid2.InternalUID2Api" ] + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + optIn.add("com.uid2.InternalUID2Api") + } } } diff --git a/securesignals-gma-dev-app/build.gradle b/securesignals-gma-dev-app/build.gradle index 1a72d29..2c26d38 100644 --- a/securesignals-gma-dev-app/build.gradle +++ b/securesignals-gma-dev-app/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidApplication - alias libs.plugins.kotlinAndroid } apply from: rootProject.file("$rootDir/common.gradle") @@ -22,6 +23,12 @@ android { } } + kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } + } + lint { disable 'GradleDependency' } @@ -33,7 +40,6 @@ dependencies { implementation project(path: ':securesignals-gma') implementation(libs.gma.ads) - implementation(libs.androidx.multidex) implementation(libs.androidx.appcompat) implementation(libs.androidx.constraintlayout) } diff --git a/securesignals-gma/build.gradle b/securesignals-gma/build.gradle index 3de7a80..8322c7e 100644 --- a/securesignals-gma/build.gradle +++ b/securesignals-gma/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidLibrary - alias libs.plugins.kotlinAndroid alias libs.plugins.mavenPublish } @@ -21,6 +22,9 @@ android { kotlin { explicitApi() + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } } } diff --git a/securesignals-ima-dev-app/build.gradle b/securesignals-ima-dev-app/build.gradle index eaaf95d..86733ec 100644 --- a/securesignals-ima-dev-app/build.gradle +++ b/securesignals-ima-dev-app/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidApplication - alias libs.plugins.kotlinAndroid } apply from: rootProject.file("$rootDir/common.gradle") @@ -22,6 +23,12 @@ android { } } + kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } + } + lint { disable 'GradleDependency', 'IconDipSize', 'IconDensities', 'RtlEnabled' } @@ -38,7 +45,6 @@ dependencies { implementation(libs.androidx.activity.ktx) implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.multidex) implementation(libs.androidx.browser) implementation(libs.androidx.media) } diff --git a/securesignals-ima/build.gradle b/securesignals-ima/build.gradle index c201329..bb1c6d5 100644 --- a/securesignals-ima/build.gradle +++ b/securesignals-ima/build.gradle @@ -1,6 +1,7 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias libs.plugins.androidLibrary - alias libs.plugins.kotlinAndroid alias libs.plugins.mavenPublish } @@ -21,6 +22,9 @@ android { kotlin { explicitApi() + compilerOptions { + jvmTarget = JvmTarget.JVM_1_8 + } } }