Skip to content

bump agp to 9.2.1 and ndk to r28c #2866

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

Closed
Kudo wants to merge 1 commit into from
+220 −211
Closed

bump agp to 9.2.1 and ndk to r28c #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r27b
ndk-version: r28c
- name: Install JDK
uses: actions/setup-java@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
id: setup-ndk
uses: nttld/setup-ndk@v1
with:
ndk-version: r27b
ndk-version: r28c
- name: Register NDK
run: |
echo $PATH
echo 'ndk.path=/opt/hostedtoolcache/ndk/r27b/x64' >> local.properties
echo 'ndk.path=/opt/hostedtoolcache/ndk/r28c/x64' >> local.properties
- name: Write GPG Sec Ring
run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
- name: Update gradle.properties
Expand Down
1 change: 0 additions & 1 deletion animated-base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion animated-drawable/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion animated-gif-lite/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.facebook.fresco.buildsrc.Deps
import com.facebook.fresco.buildsrc.GradleDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion animated-gif/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion animated-webp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ buildscript {
}
dependencies {
classpath GradleDeps.Android.gradlePlugin
classpath GradleDeps.Android.legacyKaptPlugin
classpath GradleDeps.Kotlin.gradlePlugin

// NOTE: Do not place your application dependencies here; they belong
Expand Down
5 changes: 3 additions & 2 deletions buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ package com.facebook.fresco.buildsrc
object GradleDeps {

object Android {
private const val version = "8.10.1"
private const val version = "9.2.1"

const val gradlePlugin = "com.android.tools.build:gradle:$version"
const val legacyKaptPlugin = "com.android.tools.build:gradle-kotlin:$version"
}

object Kotlin {
Expand All @@ -22,7 +23,7 @@ object GradleDeps {
}

object Native {
const val version = "27.1.12297006"
const val version = "28.2.13676358"
}

object Publishing {
Expand Down
4 changes: 3 additions & 1 deletion buildSrc/src/main/java/com/facebook/fresco/buildsrc/dependencies-samples.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ object SampleDeps {
object AndroidX {
const val appcompat = "androidx.appcompat:appcompat:1.0.2"
const val cardview = "androidx.cardview:cardview:1.0.0"
const val fragment = "androidx.fragment:fragment:1.3.5"
const val multidex = "androidx.multidex:multidex:2.0.1"
const val preference = "androidx.preference:preference:1.0.0"
const val recyclerview = "androidx.recyclerview:recyclerview:1.0.0"
const val recyclerview = "androidx.recyclerview:recyclerview:1.2.1"
const val activityKtx = "androidx.activity:activity-ktx:1.7.2"
const val vectordrawableAnimated = "androidx.vectordrawable:vectordrawable-animated:1.1.0"
}

object Google {
Expand Down
1 change: 0 additions & 1 deletion drawee-backends/drawee-pipeline/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion drawee-span/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion drawee/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.facebook.fresco.buildsrc.GradleDeps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
1 change: 0 additions & 1 deletion fbcore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.facebook.fresco.buildsrc.Deps
import com.facebook.fresco.buildsrc.TestDeps

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

kotlin {
jvmToolchain(11)
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Fri Jul 26 15:56:04 BST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading