Skip to content
This repository was archived by the owner on Mar 7, 2025. It is now read-only.

Commit 159fe48

Browse files
authored
Merge pull request #8 from wordpress-mobile/upgrade-to-gradle-7.1.1
Upgrade to gradle 7.1.1
2 parents af01fce + ef8d620 commit 159fe48

File tree

7 files changed

+56
-59
lines changed

7 files changed

+56
-59
lines changed

jitpack.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
before_install:
2-
- yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-27"
3-
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;27.0.3"
41
install:
5-
- export TMPDIR=`dirname $(mktemp)`
6-
- echo "Changing into the android folder of the Slider module"
7-
- pushd src/android && chmod +x gradlew && ./gradlew --stacktrace clean -Pgroup=com.github.wordpress-mobile.react-native-slider -Pversion=$VERSION install && popd
2+
- cd src/android && ./gradlew publishToMavenLocal

src/android/build.gradle

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,49 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
jcenter()
5-
}
6-
7-
dependencies {
8-
//noinspection GradleDependency
9-
classpath rootProject.ext.has('gradleBuildTools') ? rootProject.ext.get('gradleBuildTools') : 'com.android.tools.build:gradle:3.3.0'
10-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
11-
}
12-
}
13-
14-
def getExtOrDefault(name) {
15-
return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['ReactNativeSlider_' + name]
1+
plugins {
2+
id "com.android.library"
3+
id "maven-publish"
164
}
175

18-
def getExtOrIntegerDefault(name) {
19-
return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ReactNativeSlider_' + name]).toInteger()
20-
}
21-
22-
apply plugin: 'com.android.library'
23-
apply plugin: 'com.github.dcendents.android-maven'
24-
256
android {
26-
compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
27-
buildToolsVersion getExtOrDefault('buildToolsVersion')
7+
compileSdkVersion 30
288

29-
defaultConfig {
30-
minSdkVersion getExtOrIntegerDefault('minSdkVersion')
31-
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
32-
}
9+
defaultConfig {
10+
minSdkVersion 21
11+
targetSdkVersion 30
12+
}
3313
}
3414

3515
repositories {
36-
google()
37-
jcenter()
38-
mavenCentral()
39-
if (project == rootProject) {
40-
maven {
41-
url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror"
16+
if (project == rootProject) {
17+
maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" }
18+
} else {
19+
// When building as a dep, the RN's maven repo is locally in the node_modules folder
20+
def nodeModulesPath = "${project.buildDir}/../../node_modules/"
21+
maven { url "${nodeModulesPath}/react-native/android" }
4222
}
43-
} else {
44-
// When building as a dep, the RN's maven repo is locally in the node_modules folder
45-
def nodeModulesPath = "${project.buildDir}/../../node_modules/"
46-
maven { url "${nodeModulesPath}/react-native/android" }
47-
}
23+
24+
google()
25+
jcenter()
26+
mavenCentral()
4827
}
4928

5029
dependencies {
51-
if (project == rootProject) {
52-
// If this is the root project (e.g. Jitpack), specify a version
53-
implementation 'com.facebook.react:react-native:0.64.0'
54-
} else {
55-
//noinspection GradleDynamicVersion
56-
api "com.facebook.react:react-native:+"
57-
}
58-
}
30+
if (project == rootProject) {
31+
// If this is the root project (e.g. Jitpack), specify a version
32+
implementation 'com.facebook.react:react-native:0.64.0'
33+
} else {
34+
//noinspection GradleDynamicVersion
35+
api "com.facebook.react:react-native:+"
36+
}
37+
}
38+
39+
afterEvaluate {
40+
publishing {
41+
publications {
42+
release(MavenPublication) {
43+
from components.release
44+
groupId = 'com.github.wordpress-mobile'
45+
artifactId = 'react-native-slider'
46+
}
47+
}
48+
}
49+
}

src/android/gradle.properties

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
ReactNativeSlider_compileSdkVersion=28
2-
ReactNativeSlider_buildToolsVersion=28.0.3
3-
ReactNativeSlider_targetSdkVersion=27
4-
ReactNativeSlider_minSdkVersion=16
1+
org.gradle.jvmargs=-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError
2+
org.gradle.parallel=true
3+
org.gradle.configureondemand=true
4+
org.gradle.caching=true
5+
6+
android.useAndroidX=true
7+
android.enableJetifier=true
1.8 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Feb 09 14:36:05 CET 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

src/android/gradlew

100644100755
File mode changed.

src/android/settings.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
pluginManagement {
2+
plugins {
3+
id("com.android.library") version "4.2.2"
4+
}
5+
repositories {
6+
gradlePluginPortal()
7+
google()
8+
}
9+
}

0 commit comments

Comments
 (0)