Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ android {
}
}

kotlinOptions {
jvmTarget = '1.8'
}

lint {
abortOnError = true
warningsAsErrors = true
Expand Down
3 changes: 1 addition & 2 deletions dev-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias libs.plugins.androidApplication
alias libs.plugins.kotlinAndroid
alias libs.plugins.composeCompiler
}

Expand All @@ -22,7 +21,7 @@ android {
minifyEnabled = true
proguardFiles = [
"okhttp3-proguard-rules.txt",
getDefaultProguardFile('proguard-android.txt')
getDefaultProguardFile('proguard-android-optimize.txt')
]
signingConfig = signingConfigs.debug
}
Expand Down
4 changes: 1 addition & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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" }
Expand All @@ -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" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions prebid/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Expand All @@ -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")
}
}
}

Expand Down
11 changes: 6 additions & 5 deletions sdk/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down Expand Up @@ -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")
}
}
}

Expand Down
10 changes: 8 additions & 2 deletions securesignals-gma-dev-app/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -22,6 +23,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}

lint {
disable 'GradleDependency'
}
Expand All @@ -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)
}
6 changes: 5 additions & 1 deletion securesignals-gma/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias libs.plugins.androidLibrary
alias libs.plugins.kotlinAndroid
alias libs.plugins.mavenPublish
}

Expand All @@ -21,6 +22,9 @@ android {

kotlin {
explicitApi()
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}
}

Expand Down
10 changes: 8 additions & 2 deletions securesignals-ima-dev-app/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand All @@ -22,6 +23,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}

lint {
disable 'GradleDependency', 'IconDipSize', 'IconDensities', 'RtlEnabled'
}
Expand All @@ -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)
}
6 changes: 5 additions & 1 deletion securesignals-ima/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias libs.plugins.androidLibrary
alias libs.plugins.kotlinAndroid
alias libs.plugins.mavenPublish
}

Expand All @@ -21,6 +22,9 @@ android {

kotlin {
explicitApi()
compilerOptions {
jvmTarget = JvmTarget.JVM_1_8
}
}
}

Expand Down
Loading