Skip to content

Update lottie version to match skillz #82

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

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
30cd22b
[PS-6258] Enabling this repo to be pushed to Nexus.
Jul 12, 2019
78ffb45
[PS-6258] Removing unnecessary files from Source Control.
Jul 15, 2019
cdd809e
[PS-6258] Removing sensitive authentication information for Nexus.
Jul 15, 2019
cdb5ed9
Merge pull request #1 from skillz/Enabling-Pushing-To-Nexus
MLawlz Jul 15, 2019
6664bee
[PS-6258] Fixing package name from copied AndroidManifest so it doesn…
Jul 15, 2019
cbb5cce
[PS-6258] Bumping version number.
Jul 15, 2019
1e40a6b
Merge pull request #2 from skillz/Fixing-Package-Name
MLawlz Jul 15, 2019
f3c320a
[PS-6258] Using the correct Android src folder for pushing this code …
Jul 15, 2019
2ddf979
[PS-6258] Removing sensitive Nexus upload information.
Jul 15, 2019
b570a8a
Merge pull request #3 from skillz/Pushing-Correct-Android-SRC-Folder-…
MLawlz Jul 15, 2019
567b5c8
[PS-6258] Removing react-native as a dependency to fix duplicate modu…
Jul 16, 2019
d1b258c
Merge pull request #4 from skillz/Removing-React-Native-Dependency
MLawlz Jul 16, 2019
0aae872
Fix textinput import
greghe Apr 1, 2020
3bbd980
change to real react-native-spring-scrollview submodule
greghe May 4, 2020
0e1dbfe
fix textinputstate error
greghe May 4, 2020
ab7188f
[PS-22912] fix crash from upgrading to react native 61.5
lzcheung Jun 18, 2020
0da27a0
Merge pull request #5 from skillz/fix-rn-crash
lzcheung Jun 18, 2020
325bff7
add imports for ReadableMap
lzcheung Jun 19, 2020
935edbd
upgraded library
phixtalk Oct 19, 2021
731cb2a
Merge branch 'bolan9999-master'
phixtalk Oct 19, 2021
85e99a7
updated minSdkVersion to 23 to match with android value
phixtalk Oct 20, 2021
9b0857d
updated library, build successful
phixtalk Oct 20, 2021
749c2cd
Preparing project files for upload to Skillz Nexus
pdrlima Oct 22, 2021
6cd7e0f
Merge pull request #7 from skillz/test-spring-scrollview
pdrlima Oct 22, 2021
660e815
updated lottie version to match skillz lottie-react-native version
phixtalk Oct 22, 2021
35a91a2
removed direct reference to lottie in package.json
phixtalk Oct 25, 2021
751e87f
updated RNSpringScrollView.podspec to point to skillz
phixtalk Oct 25, 2021
a3d0c00
updated RNSpringScrollView.podspec to point to direct path to package…
phixtalk Oct 25, 2021
aab8afd
added missing files to src folder
phixtalk Oct 25, 2021
5100748
exposed springscrollview from index.js
phixtalk Oct 25, 2021
1b51e3e
added springscrollviewnative and srollview podspec to root folder
phixtalk Oct 25, 2021
aca33d1
moved springscrollview to src
phixtalk Oct 25, 2021
24dedca
updated springscrollview path in podspec
phixtalk Oct 25, 2021
f324338
upgrade to v3.0.2
phixtalk Oct 25, 2021
934c6e4
remove lottie dependency, add to peerdependency
phixtalk Oct 26, 2021
532875d
updated lottie rn to match sdk version
phixtalk Oct 26, 2021
4c36fef
clean redundant files and folders
phixtalk Oct 26, 2021
df99728
remove idx.js and styles.js redundancy
phixtalk Oct 26, 2021
24bf896
removed redundant src/ios folder
phixtalk Oct 26, 2021
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
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.xcscmblueprint

*.log

.vscode/

xcuserdata
*.xccheckout
*.moved-aside
Expand Down Expand Up @@ -57,4 +66,4 @@ buck-out/
*.jsbundle

# CocoaPods
/ios/Pods/
/ios/Pods/
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
implementation "com.facebook.react:react-native:0.65.1" // From node_modules
api project(':lottie-react-native')
api project(':react-native-spring-scroll-view')

Expand Down
67 changes: 41 additions & 26 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,53 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

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

dependencies {
classpath('com.android.tools.build:gradle:4.1.1')
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
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'
}
}

allprojects {
repositories {
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url("$rootDir/../node_modules/react-native/android")
}
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
apply plugin: 'com.android.library'

google()
jcenter()
maven { url 'https://www.jitpack.io' }
android {
compileSdkVersion 29
buildToolsVersion '29.0.0'

defaultConfig {
minSdkVersion 19
targetSdkVersion 29
versionCode 1
versionName VERSION_NAME
}
lintOptions {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

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

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

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

apply from: 'release.gradle'
8 changes: 8 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,11 @@ android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.75.1

VERSION_NAME=3.0.2-skillz
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
100 changes: 100 additions & 0 deletions android/release.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'signing'

def configureReactNativePom(def pom) {
pom.artifactId = POM_ARTIFACT_ID
pom.name = GROUP
pom.packaging = POM_PACKAGING
pom.version = VERSION_NAME
pom.groupId = "com.react-native-spring-scrollview"
archivesBaseName='react-native-spring-scrollview-android'

pom.project {
name POM_NAME

description 'A high performance cross-platform native bounces ScrollView for React Native.'
url 'https://github.com/skillz/react-native-spring-scrollview'

scm {
url 'https://github.com/skillz/react-native-spring-scrollview.git'
connection 'scm:git:https://github.com/skillz/react-native-spring-scrollview.git'
developerConnection 'scm:git:[email protected]/skillz/react-native-spring-scrollview.git'
}

licenses {
license {
name 'Proprietary'
distribution 'repo'
}
}

developers {
developer {
id 'skillz'
name 'Skillz'
}
}
}
}

afterEvaluate { project ->

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.srcDirs
include '**/*.java'
}

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

android.libraryVariants.all { variant ->
def name = variant.name.capitalize()
task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
from variant.javaCompile.destinationDir
}
}

version = VERSION_NAME
group = GROUP

signing {
required { gradle.taskGraph.hasTask('uploadArchives') }

sign configurations.archives
}

uploadArchives {
configuration = configurations.archives

repositories.mavenDeployer {
beforeDeployment {
MavenDeployment deployment -> signing.signPom(deployment)
}

repository(url: 'http://nexus.skillz.com/content/repositories/thirdparty/') {
authentication(userName: "garbage", password: "garbage")
}

configureReactNativePom pom
}
}

task installArchives(type: Upload) {
configuration = configurations.archives

repositories.mavenDeployer {

repository url: "file://${projectDir}/../android"

configureReactNativePom pom

}
}
}
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')
6 changes: 6 additions & 0 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.bolan9999">

</manifest>

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.UIManagerModule;
Expand Down Expand Up @@ -369,7 +370,7 @@ public void setContentOffset(float x, float y) {
WritableMap contentOffsetMap = Arguments.createMap();
contentOffsetMap.putDouble("x", PixelUtil.toDIPFromPixel(contentOffset.x));
contentOffsetMap.putDouble("y", PixelUtil.toDIPFromPixel(contentOffset.y));
event.putMap("contentOffset", contentOffsetMap);
event.putMap("contentOffset", (ReadableMap)contentOffsetMap);
event.putString("refreshStatus", refreshStatus);
event.putString("loadingStatus", loadingStatus);
sendOnScrollEvent(event);
Expand Down
Empty file removed docs/.nojekyll
Empty file.
8 changes: 0 additions & 8 deletions docs/_coverpage.md

This file was deleted.

3 changes: 0 additions & 3 deletions docs/_navbar.md

This file was deleted.

16 changes: 0 additions & 16 deletions docs/en/V2/BasicContent.md

This file was deleted.

18 changes: 0 additions & 18 deletions docs/en/V2/BasicControl.md

This file was deleted.

Loading