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

[Android] Drop support for AGP version <= 7 #3077

Merged
merged 4 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ You will need to have an Android or iOS device or emulator connected.

| version | react-native version |
| ------- | -------------------- |
| 2.18.0+ | 0.73.0+ |
| 2.16.0+ | 0.68.0+ |
| 2.14.0+ | 0.67.0+ |
| 2.10.0+ | 0.64.0+ |
Expand Down
21 changes: 4 additions & 17 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import groovy.json.JsonSlurper

import javax.inject.Inject
import java.nio.file.Files

buildscript {
def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']

Expand Down Expand Up @@ -98,15 +95,11 @@ repositories {

android {
compileSdkVersion safeExtGet("compileSdkVersion", 33)
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
namespace "com.swmansion.gesturehandler"
}

if (agpVersion.tokenize('.')[0].toInteger() >= 8) {
buildFeatures {
buildConfig = true
}
namespace "com.swmansion.gesturehandler"
buildFeatures {
buildConfig = true
prefab true
latekvo marked this conversation as resolved.
Show resolved Hide resolved
}

// Used to override the NDK path/version on internal CI or by allowing
Expand All @@ -118,12 +111,6 @@ android {
ndkVersion rootProject.ext.ndkVersion
}

if (REACT_NATIVE_MINOR_VERSION >= 71) {
buildFeatures {
prefab true
}
}

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 21)
targetSdkVersion safeExtGet('targetSdkVersion', 33)
Expand Down
4 changes: 1 addition & 3 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.swmansion.gesturehandler">
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
Loading