diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b258f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,41 @@
+### Android Studio ###
+.idea/
+.gradle/
+local.properties
+
+### Xcode ###
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+### /Xcode ###
+
+### OS X
+.DS_Store
+
+### Node
+node_modules
+*.log
+yarn.lock
+
+## Android iml
+*.iml
+
+.vscode/
\ No newline at end of file
diff --git a/android/SpringScrollViewExample.iml b/android/SpringScrollViewExample.iml
index e0dbc2d..c787ff3 100644
--- a/android/SpringScrollViewExample.iml
+++ b/android/SpringScrollViewExample.iml
@@ -1,19 +1,169 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/app/app.iml b/android/app/app.iml
index e522588..2378e13 100644
--- a/android/app/app.iml
+++ b/android/app/app.iml
@@ -17,7 +17,8 @@
-
+
+
@@ -47,13 +48,6 @@
-
-
-
-
-
-
-
@@ -61,6 +55,13 @@
+
+
+
+
+
+
+
@@ -68,13 +69,6 @@
-
-
-
-
-
-
-
@@ -82,83 +76,95 @@
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
-
-
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
-
+
+
-
+
+
+
-
+
+
+
+
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fad2f30..1ece955 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -94,14 +94,14 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false
android {
- compileSdkVersion 26
+ compileSdkVersion 29
defaultConfig {
applicationId "com.springscrollviewexample"
- minSdkVersion 16
- targetSdkVersion 26
- versionCode 1
- versionName "1.0"
+ minSdkVersion 24
+ targetSdkVersion 29
+ versionCode 10
+ versionName "2.1"
ndk {
abiFilters "armeabi-v7a", "x86"
}
@@ -133,6 +133,9 @@ android {
}
}
}
+ lintOptions {
+ abortOnError false
+ }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -140,10 +143,10 @@ android {
}
dependencies {
- api project(':lottie-react-native')
+ //api project(':lottie-react-native')
api project(':react-native-spring-scroll-view')
api fileTree(dir: "libs", include: ["*.jar"])
- api "com.android.support:appcompat-v7:26.0.0"
+ api "com.android.support:appcompat-v7:28.0.0"
api "com.facebook.react:react-native:+" // From node_modules
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c6dccce..fba3331 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,26 +1,21 @@
-
-
-
+
+
-
-
-
+
+
-
-
+
+
-
+
-
diff --git a/android/app/src/main/java/com/springscrollviewexample/MainApplication.java b/android/app/src/main/java/com/springscrollviewexample/MainApplication.java
index 03bbad3..bc06f2f 100644
--- a/android/app/src/main/java/com/springscrollviewexample/MainApplication.java
+++ b/android/app/src/main/java/com/springscrollviewexample/MainApplication.java
@@ -4,7 +4,7 @@
import com.bolan9999.SpringScrollViewPackage;
import com.facebook.react.ReactApplication;
-import com.airbnb.android.react.lottie.LottiePackage;
+// import com.airbnb.android.react.lottie.LottiePackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
@@ -25,7 +25,7 @@ public boolean getUseDeveloperSupport() {
protected List getPackages() {
return Arrays.asList(
new MainReactPackage(),
- new LottiePackage(),
+ //new LottiePackage(),
new SpringScrollViewPackage()
);
}
diff --git a/android/build.gradle b/android/build.gradle
index 79741e1..2544be0 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,28 +1,75 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+import groovy.json.JsonSlurper
+
+def computeVersionName() {
+ // dynamically retrieve version from package.json
+ def slurper = new JsonSlurper()
+ def json = slurper.parse(file('../package.json'), "utf-8")
+ return json.version
+}
buildscript {
+ ext {
+ buildToolsVersion = "29.0.0"
+ minSdkVersion = 24
+ compileSdkVersion = 29
+ targetSdkVersion = 29
+ supportLibVersion = "28.0.0"
+ }
repositories {
- jcenter()
google()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.1'
+ classpath 'com.android.tools.build:gradle:3.4.2'
+ 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'
+ }
+}
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 29
+ buildToolsVersion '29.0.0'
+ defaultConfig {
+ minSdkVersion 24
+ targetSdkVersion 28
+ versionCode 10
+ versionName computeVersionName()
+ }
+ lintOptions {
+ abortOnError false
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
}
}
allprojects {
repositories {
- mavenLocal()
+ google()
jcenter()
- maven {
- url 'https://maven.google.com'
- }
- maven {
- // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
- url "$rootDir/../node_modules/react-native/android"
- }
+ maven { url "$rootDir/../node_modules/react-native/android" }
}
}
+
+repositories {
+ google()
+ mavenCentral()
+ maven { url 'http://nexus.skillz.com/content/groups/public' }
+ maven { url 'http://nexus.skillz.com/content/repositories/snapshots' }
+ maven { url 'https://maven.fabric.io/public' }
+ jcenter()
+ flatDir { dirs 'libs', '../../node_modules' }
+}
+
+dependencies {
+ implementation 'com.facebook.react:react-native:0.59.10'
+ api 'com.android.support:support-v4:28.0.0'
+ api 'com.android.support:appcompat-v7:28.0.0'
+ api 'com.android.support:exifinterface:28.0.0'
+}
+
+apply from: 'release.gradle'
\ No newline at end of file
diff --git a/android/gradle.properties b/android/gradle.properties
index 1fd964e..67c9e98 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -16,5 +16,14 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-
android.useDeprecatedNdk=true
+MOCKITO_CORE_VERSION=1.+
+POWERMOCK_VERSION=1.6.2
+FEST_ASSERT_CORE_VERSION=2.0M10
+
+VERSION_NAME=2.1.2-skillz
+GROUP=com.springscrollviewexample
+
+POM_NAME=ReactNativeSpringScrollview
+POM_ARTIFACT_ID=react-native-spring-scrollview-android
+POM_PACKAGING=aar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 313ff50..ff3105a 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 18 19:04:33 CST 2019
+#Fri Jul 12 10:03:42 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
diff --git a/android/release.gradle b/android/release.gradle
new file mode 100644
index 0000000..b850915
--- /dev/null
+++ b/android/release.gradle
@@ -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.springscrollviewexample"
+ 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:git@github.com/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 'assembleLiveRelease'
+ from('build/outputs/aar')
+ into('build/outputs/aar')
+ include('android-release.aar')
+ rename ('android-release.aar',
+ 'react-native-spring-scrollview.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
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 4919a27..6846ddc 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,6 +1,6 @@
rootProject.name = 'SpringScrollViewExample'
-include ':lottie-react-native'
-project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
+// 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')
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..48e2346
--- /dev/null
+++ b/android/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/package.json b/package.json
index 4aac9e0..6067854 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "SpringScrollViewExample",
- "version": "0.0.1",
+ "version": "0.0.4",
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
diff --git a/src/android/build.gradle b/src/android/build.gradle
index f7d8e08..6c89985 100644
--- a/src/android/build.gradle
+++ b/src/android/build.gradle
@@ -15,12 +15,12 @@ buildscript {
apply plugin: 'com.android.library'
android {
- compileSdkVersion safeExtGet('compileSdkVersion', 26)
+ compileSdkVersion safeExtGet('compileSdkVersion', 29)
publishNonDefault true
defaultConfig {
- minSdkVersion safeExtGet('minSdkVersion', 16)
- targetSdkVersion safeExtGet('targetSdkVersion', 26)
+ minSdkVersion safeExtGet('minSdkVersion', 24)
+ targetSdkVersion safeExtGet('targetSdkVersion', 29)
}
lintOptions {
abortOnError false
diff --git a/src/android/react-native-spring-scroll-view.iml b/src/android/react-native-spring-scroll-view.iml
index efda7bb..87e5845 100644
--- a/src/android/react-native-spring-scroll-view.iml
+++ b/src/android/react-native-spring-scroll-view.iml
@@ -17,7 +17,8 @@
-
+
+
@@ -48,13 +49,6 @@
-
-
-
-
-
-
-
@@ -62,6 +56,13 @@
+
+
+
+
+
+
+
@@ -69,13 +70,6 @@
-
-
-
-
-
-
-
@@ -83,45 +77,43 @@
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
+
-
-
+
-
+
+
-
+
-
+