Skip to content

Preparing project files for upload to Skillz Nexus #7

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

Merged
merged 1 commit into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
63 changes: 29 additions & 34 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,53 @@
def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}

buildscript {
ext {
buildToolsVersion = "29.0.3"
minSdkVersion = 24
compileSdkVersion = 29
targetSdkVersion = 29
ndkVersion = "20.1.5948944"
}
repositories {
google()
mavenCentral()
maven {
url 'http://nexus.skillz.com/content/groups/public'
}

jcenter()
mavenCentral()
maven { url 'http://nexus.skillz.com/content/groups/public' }
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:3.6.4'
classpath 'de.undercouch:gradle-download-task:3.4.3'
classpath 'com.google.gms:google-services:4.3.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion safeExtGet('compileSdkVersion', 29)
publishNonDefault true
compileSdkVersion 29
buildToolsVersion '29.0.0'

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 24)
targetSdkVersion safeExtGet('targetSdkVersion', 29)
minSdkVersion 19
targetSdkVersion 29
versionCode 1
versionName VERSION_NAME
}
lintOptions {
abortOnError false
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

allprojects {
repositories {
google()
mavenCentral()
maven {
url 'http://nexus.skillz.com/content/groups/public'
}

jcenter()
repositories {
google()
mavenCentral()
maven {
url 'http://nexus.skillz.com/content/groups/public'
}

jcenter()
flatDir { dirs 'libs', '../../node_modules' }
}

dependencies {
api 'com.facebook.react:react-native:0.65.1'
implementation 'com.facebook.react:react-native:0.65.1' // Skillz' react-native-v8 aar
}


apply from: 'release.gradle'
6 changes: 4 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ android.enableJetifier=true
FLIPPER_VERSION=0.75.1

VERSION_NAME=3.0.2-skillz
GROUP=com.springscrollviewexample
MOCKITO_CORE_VERSION=1.+
POWERMOCK_VERSION=1.6.2
GROUP=com.bolan9999
POM_NAME=ReactNativeSpringScrollview
POM_ARTIFACT_ID=react-native-spring-scrollview-android
POM_PACKAGING=aar
POM_PACKAGING=aar
6 changes: 3 additions & 3 deletions android/release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def configureReactNativePom(def pom) {
pom.name = GROUP
pom.packaging = POM_PACKAGING
pom.version = VERSION_NAME
pom.groupId = "com.springscrollviewexample"
pom.groupId = "com.react-native-spring-scrollview"
archivesBaseName='react-native-spring-scrollview-android'

pom.project {
Expand Down Expand Up @@ -46,12 +46,12 @@ afterEvaluate { project ->
}

task renameArchive(type: Copy) {
dependsOn 'assembleLiveRelease'
dependsOn 'assembleRelease'
from('build/outputs/aar')
into('build/outputs/aar')
include('android-release.aar')
rename ('android-release.aar',
'react-native-spring-scrollview.aar')
'react-native-spring-scroll-view-release.aar')
}

android.libraryVariants.all { variant ->
Expand Down
9 changes: 2 additions & 7 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
rootProject.name = 'SSVExample'
rootProject.name = 'react-native-spring-scroll-view'

include ':lottie-react-native'
project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
include ':react-native-spring-scroll-view'
project(':react-native-spring-scroll-view').projectDir = new File(rootProject.projectDir, '../src/android')

apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
project(':react-native-spring-scroll-view').projectDir = new File(rootProject.projectDir, '../src/android')
5 changes: 4 additions & 1 deletion src/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.1'
classpath 'com.android.tools.build:gradle:4.1.3'
}
}

Expand All @@ -29,7 +29,10 @@ android {
}

repositories {
jcenter()
google()
mavenCentral()
maven { url 'http://nexus.skillz.com/content/groups/public' }
}

dependencies {
Expand Down
140 changes: 0 additions & 140 deletions src/android/react-native-spring-scroll-view.iml

This file was deleted.