Skip to content

Supply Chain: bump AGP to 8.6.1 to drop blocked bcprov-jdk15on:1.67 #321

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.

Sign up for GitHub

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

Open
wenxi-zeng wants to merge 5 commits into
base: supplychain_gradle
Choose a base branch
from
Open

Supply Chain: bump AGP to 8.6.1 to drop blocked bcprov-jdk15on:1.67 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24c4194
Supply Chain: bump AGP to 8.6.1 to drop blocked bcprov-jdk15on:1.67
wenxi-zeng Aug 14, 2026
87d2e67
Supply Chain: force bcprov/bcutil-jdk18on to 1.81 (CVE-clean)
wenxi-zeng Aug 14, 2026
f97640d
Supply Chain: disable extractAnnotations (unresolvable bcprov 1.77)
wenxi-zeng Aug 14, 2026
7b8f6fb
Revert extractAnnotations task disable (broke syncLibJars)
wenxi-zeng Aug 14, 2026
f091dd2
Supply Chain: bump AGP to 8.10.1 to test bcprov 1.79 curation
wenxi-zeng Aug 14, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/supplychain-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@cf277c60eb25467037889841efdb72551f06f6c3 # v4.9.1
with:
distribution: "temurin"
java-version: "11"
java-version: "17"

# Only cache if it's a fork
- name: Cache Gradle dependencies
Expand Down
5 changes: 5 additions & 0 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ plugins {
}

android {
namespace 'com.segment.analytics'
compileSdkVersion 33

buildFeatures {
buildConfig true
}

defaultConfig {
// Required when setting minSdkVersion to 20 or lower
multiDexEnabled true
Expand Down
3 changes: 1 addition & 2 deletions android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.segment.analytics">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.10.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.disableAutomaticComponentCreation=true

# Deployment variables
GROUP=com.segment.analytics.kotlin
Expand Down
5 changes: 5 additions & 0 deletions samples/java-android-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ plugins {
}

android {
namespace 'com.segment.analytics.javaandroidapp'
compileSdkVersion 33

buildFeatures {
buildConfig true
}

defaultConfig {
applicationId "com.segment.analytics.javaandroidapp"
minSdkVersion 16
Expand Down
3 changes: 1 addition & 2 deletions samples/java-android-app/src/main/AndroidManifest.xml
View file
Open in desktop
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.segment.analytics.javaandroidapp">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:name=".MainApplication"
Expand Down
5 changes: 5 additions & 0 deletions samples/kotlin-android-app-destinations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ plugins {
}

android {
namespace 'com.segment.analytics.kotlin.destinations'
compileSdkVersion 33

buildFeatures {
buildConfig true
}

defaultConfig {
multiDexEnabled true
applicationId "com.segment.analytics.kotlin.destinations"
Expand Down
3 changes: 1 addition & 2 deletions samples/kotlin-android-app-destinations/src/main/AndroidManifest.xml
View file
Open in desktop
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.segment.analytics.kotlin.destinations">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Required for internet. -->
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
5 changes: 5 additions & 0 deletions samples/kotlin-android-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ plugins {
}

android {
namespace 'com.segment.analytics.next'
compileSdkVersion 33

buildFeatures {
buildConfig true
}

defaultConfig {
multiDexEnabled true
applicationId "com.segment.analytics.next"
Expand Down
3 changes: 1 addition & 2 deletions samples/kotlin-android-app/src/main/AndroidManifest.xml
View file
Open in desktop
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.segment.analytics.next">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Required for internet. -->
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
Loading