Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update targetSdk version for core + all modules #250

Merged
merged 13 commits into from
Feb 18, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
api-level: [21, 29]
api-level: [21, 35]
steps:
- uses: actions/checkout@v1
- name: Enable KVM
Expand Down Expand Up @@ -50,10 +50,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Build debug APK
run: bash ./gradlew assembleDebug --stacktrace --warning-mode all
- name: Upload APK
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change Log

- 1.7.1 Jan 2025
- Update targetSdk version to 35
- Update Android Gradle Plugin to 1.8.22
- 1.7.0 Nov 2024
- `TealiumInitProvider` added to automatically execute the minimum amount of Tealium work on the Main Thread at app launch
- This will register for Application/Activity lifecycle events at launch
Expand Down
14 changes: 11 additions & 3 deletions adidentifier/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
apply from: '../jacoco.gradle'

version = '1.1.2'
version = '1.1.3'

android {
compileSdkVersion 33
namespace = 'com.tealium.adidentifier'

compileSdk = 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 35
buildConfigField 'String', 'TAG', "\"Tealium-AdIdentifier-$version\""
buildConfigField 'String', 'LIBRARY_VERSION', "\"$version\""

Expand All @@ -29,13 +31,19 @@ android {
testCoverageEnabled true
}
}

buildFeatures {
buildConfig true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11

}

testOptions {
Expand Down
3 changes: 1 addition & 2 deletions adidentifier/src/androidTest/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.adidentifier">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<meta-data
android:name="com.google.android.gms.version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ class AdIdentifierIntegratedTests {

@Before
fun setUp() {
config = spyk(
config =
TealiumConfig(
application,
"test",
"test",
Environment.DEV,
collectors = mutableSetOf()
)
)

dataLayer = mockk(relaxed = true)
tealiumContext = TealiumContext(
Expand Down
3 changes: 1 addition & 2 deletions adidentifier/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.adidentifier">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
</manifest>
14 changes: 10 additions & 4 deletions autotracking/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
apply from: '../jacoco.gradle'

version = "1.0.1"
version = "1.0.2"

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = 'com.tealium.autotracking'

compileSdk = 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 35
buildConfigField 'String', 'TAG', "\"Tealium-AutoTracking-$version\""
buildConfigField 'String', 'LIBRARY_VERSION', "\"$version\""

Expand All @@ -31,13 +32,18 @@ android {
}
}

buildFeatures {
buildConfig true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11

}

testOptions {
Expand Down
4 changes: 1 addition & 3 deletions autotracking/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.autotracking">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
35 changes: 25 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.6.21'
ext.coroutines_core_version = '1.6.2'
ext.coroutines_android_version = '1.6.2'
ext.coroutines_test_version = '1.6.2'
ext.mockk_version = '1.12.0'
ext.robolectric_version = '4.10.3'
ext.kotlin_version = '1.8.22'
ext.coroutines_core_version = '1.8.0'
ext.coroutines_android_version = '1.8.0'
ext.coroutines_test_version = '1.8.0'
ext.mockk_version = '1.13.16'
ext.robolectric_version = '4.14.1'

repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:8.6.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "org.jacoco:org.jacoco.core:0.8.7"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"

// Firebase integration
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.gms:google-services:4.4.2'
}
}

Expand All @@ -39,8 +39,8 @@ allprojects {
}
}

task clean(type: Delete) {
delete rootProject.buildDir
tasks.register('clean', Delete) {
delete rootProject.getLayout().getBuildDirectory()
}

subprojects {
Expand All @@ -60,4 +60,19 @@ subprojects {
}
}
}

afterEvaluate {
if (project.extensions.findByName("android") != null) {
android {
kotlinOptions.freeCompilerArgs = ["-Xstring-concat=inline"]
packagingOptions {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
merges += "META-INF/LICENSE.md"
merges += "META-INF/LICENSE-notice.md"
}
}
}
}
}
}
13 changes: 9 additions & 4 deletions collectdispatcher/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
apply from: '../jacoco.gradle'

version = '1.1.1'
version = '1.1.2'

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = 'com.tealium.collectdispatcher'

compileSdk = 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 35
buildConfigField 'String', 'TAG', "\"Tealium-CollectDispatcher-$version\""
buildConfigField 'String', 'LIBRARY_VERSION', "\"$version\""

Expand All @@ -31,6 +32,10 @@ android {
}
}

buildFeatures {
buildConfig true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
Expand Down
3 changes: 1 addition & 2 deletions collectdispatcher/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.collectdispatcher" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import java.io.File


@RunWith(RobolectricTestRunner::class)
@Config(sdk = [21, 29])
@Config(sdk = [21, 35])
class CollectDispatcherTests {

@MockK
Expand Down
14 changes: 10 additions & 4 deletions crashreporter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
apply from: '../jacoco.gradle'

version = '1.1.1'
version = '1.1.2'

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = 'com.tealium.crashreporter'

compileSdk = 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 35
buildConfigField 'String', 'TAG', "\"Tealium-CrashReporter-$version\""
buildConfigField 'String', 'LIBRARY_VERSION', "\"$version\""

Expand All @@ -31,13 +32,18 @@ android {
}
}

buildFeatures {
buildConfig true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11

}

testOptions {
Expand Down
3 changes: 1 addition & 2 deletions crashreporter/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.crashreporter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Thu Jan 30 07:36:32 PST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 10 additions & 4 deletions hosteddatalayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'maven-publish'
apply from: '../jacoco.gradle'

version = '1.1.1'
version = '1.1.2'

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = 'com.tealium.hosteddatalayer'

compileSdk = 35

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 35

buildConfigField 'String', 'TAG', "\"Tealium-HostedDataLayer-$version\""
buildConfigField 'String', 'LIBRARY_VERSION', "\"$version\""
Expand All @@ -33,13 +34,18 @@ android {
}
}

buildFeatures {
buildConfig true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11

}

testOptions {
Expand Down
3 changes: 1 addition & 2 deletions hosteddatalayer/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.hosteddatalayer" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
Loading