Skip to content

Commit

Permalink
AGP to 8.0.1 (facebook#1280)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebook#1280

I'm refreshing some of the dependencies of the project,
here doing AGP to 8.0.1.
I'm also removing the older publishing plugin as we're most likely going to use
Gradle's default publishing + another plugin to manage the nexus interactions (the same we use on React Native).

I'm also doing some changes on the JDK side:
- Bumps the JDK version to 17 as that's required by AGP
- Bumps the source/target version to JDK 8. JDK 7 is long deprecated and we're getting a lot of warnings for it on console. Users should be on JDK 11 already by now, but 8 is also good enough.

Reviewed By: passy

Differential Revision: D45564575

fbshipit-source-id: ffe1cc15892659923177a2cad609d5d30f8249ac
  • Loading branch information
cortinico authored and facebook-github-bot committed May 5, 2023
1 parent 3a69a04 commit 54d7892
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ runs:
- name: Select Java Version
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
distribution: zulu
java-version: 17
9 changes: 7 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ android {
targetCompatibility rootProject.targetCompatibilityVersion
sourceCompatibility rootProject.sourceCompatibilityVersion
}

publishing {
multipleVariants {
withSourcesJar()
includeBuildTypeValues('debug', 'release')
}
}
}

dependencies {
Expand All @@ -34,5 +41,3 @@ dependencies {
tasks.withType(Javadoc).all {
enabled = false
}

apply plugin: 'com.vanniktech.maven.publish'
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
classpath 'com.android.tools.build:gradle:8.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -34,8 +33,8 @@ ext {
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7
sourceCompatibilityVersion = JavaVersion.VERSION_1_8
targetCompatibilityVersion = JavaVersion.VERSION_1_8
}

task clean(type: Delete) {
Expand Down
9 changes: 7 additions & 2 deletions java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@ android {
res.srcDirs = ['res']
}
}

publishing {
multipleVariants {
withSourcesJar()
includeBuildTypeValues('debug', 'release')
}
}
}

dependencies {
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.facebook.soloader:soloader:0.10.4'
testImplementation 'junit:junit:4.12'
}

apply plugin: 'com.vanniktech.maven.publish'

0 comments on commit 54d7892

Please sign in to comment.