Skip to content
This repository was archived by the owner on Jun 22, 2021. It is now read-only.

Commit c0f5906

Browse files
author
cole stoltzfus
committed
couchbase package to v1
1 parent 8a21c59 commit c0f5906

File tree

123 files changed

+800
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+800
-750
lines changed

.gitmodules

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[submodule "libraries/couchbase-lite-java-core"]
22
path = libraries/couchbase-lite-java-core
3-
url = https://github.com/couchbase/couchbase-lite-java-core.git
4-
[submodule "libraries/couchbase-lite-java-forestdb"]
5-
path = libraries/couchbase-lite-java-forestdb
6-
url = https://github.com/couchbaselabs/couchbase-lite-java-forestdb.git
3+
url = https://github.com/hammerheadnav/couchbase-lite-java-core.git
4+
branch = release/1.4.1
75
[submodule "libraries/couchbase-lite-java-native"]
86
path = libraries/couchbase-lite-java-native
9-
url = https://github.com/couchbase/couchbase-lite-java-native
7+
url = https://github.com/hammerheadnav/couchbase-lite-java-native
8+
branch = release/1.4.1

build.gradle

Lines changed: 60 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,17 @@ version = System.getenv("MAVEN_UPLOAD_VERSION")
99
buildscript {
1010
repositories {
1111
jcenter()
12+
google()
1213
}
1314
dependencies {
14-
classpath 'com.android.tools.build:gradle:2.1.2'
15+
classpath 'com.android.tools.build:gradle:3.6.4'
16+
}
17+
}
18+
19+
allprojects {
20+
repositories {
21+
google() // and here
22+
jcenter()
1523
}
1624
}
1725

@@ -21,13 +29,21 @@ repositories {
2129
mavenCentral()
2230
}
2331

32+
sourceSets {
33+
main {
34+
java.srcDirs = [
35+
'src/main/java'
36+
]
37+
}
38+
}
39+
2440
android {
2541
compileSdkVersion 24
2642
buildToolsVersion "24.0.0"
2743

2844
defaultConfig {
29-
minSdkVersion 9
30-
targetSdkVersion 24
45+
minSdkVersion 23
46+
targetSdkVersion 23
3147
versionCode 1
3248
versionName "1.0"
3349
}
@@ -37,6 +53,10 @@ android {
3753
targetCompatibility JavaVersion.VERSION_1_6
3854
}
3955

56+
sourceSets {
57+
main.java.srcDirs += 'src/main/java'
58+
}
59+
4060
buildTypes {
4161
release {
4262
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
@@ -63,18 +83,14 @@ dependencies {
6383
project(':libraries:couchbase-lite-java-core') :
6484
'com.couchbase.lite:couchbase-lite-java-core:' + version
6585

66-
compile buildAndroidWithArtifacts == null ?
67-
project(':libraries:couchbase-lite-java-native:sqlite-custom') :
68-
'com.couchbase.lite:couchbase-lite-android-sqlite-custom:' + version
86+
compile 'com.couchbase.lite:couchbase-lite-android-sqlite-custom:1.4.1'
6987

7088
// Libraries required for tests only:
71-
androidTestCompile buildAndroidWithArtifacts == null ?
72-
project(':libraries:couchbase-lite-java-native:sqlcipher') :
73-
'com.couchbase.lite:couchbase-lite-android-sqlcipher:' + version
89+
androidTestCompile 'com.couchbase.lite:couchbase-lite-android-sqlcipher:1.4.1'
7490

75-
androidTestCompile buildAndroidWithArtifacts == null ?
76-
project(':libraries:couchbase-lite-java-forestdb') :
77-
'com.couchbase.lite:couchbase-lite-android-forestdb:' + version
91+
// androidTestCompile buildAndroidWithArtifacts == null ?
92+
// project(':libraries:couchbase-lite-java-forestdb') :
93+
// 'com.couchbase.lite:couchbase-lite-android-forestdb:' + version
7894

7995
androidTestCompile 'commons-io:commons-io:2.0.1'
8096
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.1'
@@ -124,38 +140,38 @@ task createMavenDirectory(type: Exec) {
124140
createMavenDirectory.onlyIf { System.getenv("MAVEN_UPLOAD_REPO_URL").contains("files") }
125141

126142
// first create the directory, then do the upload
127-
task uploadArchivesWrapper(dependsOn: createMavenDirectory) << {
128-
uploadArchives.execute()
129-
}
130-
131-
def mavenPath() {
132-
System.getenv("MAVEN_BUILD_LOCAL") == "true" ?
133-
'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath :
134-
System.getenv("MAVEN_UPLOAD_REPO_URL")
135-
}
136-
137-
// this will upload, but will not first create a directory (which is needed on some servers)
138-
uploadArchives {
139-
repositories {
140-
mavenDeployer {
141-
repository(url: mavenPath()) {
142-
authentication(userName: System.getenv("MAVEN_UPLOAD_USERNAME"), password: System.getenv("MAVEN_UPLOAD_PASSWORD"))
143-
}
144-
pom.version = System.getenv("MAVEN_UPLOAD_VERSION") != null ? System.getenv("MAVEN_UPLOAD_VERSION") : ''
145-
pom.groupId = 'com.couchbase.lite'
146-
pom.artifactId = 'couchbase-lite-android'
147-
pom.project {
148-
licenses {
149-
license {
150-
name 'Couchbase Community Edition License Agreement'
151-
url 'http://www.couchbase.com/agreement/community'
152-
distribution 'repo'
153-
}
154-
}
155-
}
156-
}
157-
}
158-
}
143+
//task uploadArchivesWrapper(dependsOn: createMavenDirectory) << {
144+
// uploadArchives.execute()
145+
//}
146+
//
147+
//def mavenPath() {
148+
// System.getenv("MAVEN_BUILD_LOCAL") == "true" ?
149+
// 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath :
150+
// System.getenv("MAVEN_UPLOAD_REPO_URL")
151+
//}
152+
//
153+
//// this will upload, but will not first create a directory (which is needed on some servers)
154+
//uploadArchives {
155+
// repositories {
156+
// mavenDeployer {
157+
// repository(url: mavenPath()) {
158+
// authentication(userName: System.getenv("MAVEN_UPLOAD_USERNAME"), password: System.getenv("MAVEN_UPLOAD_PASSWORD"))
159+
// }
160+
// pom.version = System.getenv("MAVEN_UPLOAD_VERSION") != null ? System.getenv("MAVEN_UPLOAD_VERSION") : ''
161+
// pom.groupId = 'com.couchbase.lite'
162+
// pom.artifactId = 'couchbase-lite-android'
163+
// pom.project {
164+
// licenses {
165+
// license {
166+
// name 'Couchbase Community Edition License Agreement'
167+
// url 'http://www.couchbase.com/agreement/community'
168+
// distribution 'repo'
169+
// }
170+
// }
171+
// }
172+
// }
173+
// }
174+
//}
159175

160176

161177
task sourcesJar(type: Jar) {

gradle/wrapper/gradle-wrapper.jar

4.94 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Aug 18 12:13:56 PDT 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

gradlew

Lines changed: 66 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,59 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
218

319
##############################################################################
420
##
521
## Gradle start up script for UN*X
622
##
723
##############################################################################
824

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
1142

1243
APP_NAME="Gradle"
1344
APP_BASE_NAME=`basename "$0"`
1445

46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
1549
# Use the maximum available, or set MAX_FD != -1 to use that value.
1650
MAX_FD="maximum"
1751

18-
warn ( ) {
52+
warn () {
1953
echo "$*"
2054
}
2155

22-
die ( ) {
56+
die () {
2357
echo
2458
echo "$*"
2559
echo
@@ -30,6 +64,7 @@ die ( ) {
3064
cygwin=false
3165
msys=false
3266
darwin=false
67+
nonstop=false
3368
case "`uname`" in
3469
CYGWIN* )
3570
cygwin=true
@@ -40,26 +75,11 @@ case "`uname`" in
4075
MINGW* )
4176
msys=true
4277
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
4381
esac
4482

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6484

6585
# Determine the Java command to use to start the JVM.
@@ -85,7 +105,7 @@ location of your Java installation."
85105
fi
86106

87107
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
89109
MAX_FD_LIMIT=`ulimit -H -n`
90110
if [ $? -eq 0 ] ; then
91111
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -105,8 +125,8 @@ if $darwin; then
105125
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106126
fi
107127

108-
# For Cygwin, switch paths to Windows format before running java
109-
if $cygwin ; then
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
110130
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111131
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112132
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -134,27 +154,30 @@ if $cygwin ; then
134154
else
135155
eval `echo args$i`="\"$arg\""
136156
fi
137-
i=$((i+1))
157+
i=`expr $i + 1`
138158
done
139159
case $i in
140-
(0) set -- ;;
141-
(1) set -- "$args0" ;;
142-
(2) set -- "$args0" "$args1" ;;
143-
(3) set -- "$args0" "$args1" "$args2" ;;
144-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
160+
0) set -- ;;
161+
1) set -- "$args0" ;;
162+
2) set -- "$args0" "$args1" ;;
163+
3) set -- "$args0" "$args1" "$args2" ;;
164+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150170
esac
151171
fi
152172

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
173+
# Escape application args
174+
save () {
175+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176+
echo " "
156177
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
178+
APP_ARGS=`save "$@"`
179+
180+
# Collect all arguments for the java command, following the shell quoting and substitution rules
181+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
159182

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
183+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)