Skip to content

Commit 1ae89e3

Browse files
cmelchiorcmelchior
committed
Merge branch 'master' into cm-json-import-api
Conflicts: changelog.txt realm/src/main/java/io/realm/RealmObject.java settings.gradle
2 parents db92dcb + c08ac4e commit 1ae89e3

145 files changed

Lines changed: 4298 additions & 1533 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ realm_version_check.timestamp
3232

3333
# Backup files
3434
*.bak
35+
*~
3536

3637
# Navigation Editor
3738
.navigation

‎build-distribution.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,15 @@ cp -R examples/migrationExample/src distribution/RealmMigrationExample/app
2828
echo "Copying files to the distribution/RealmConcurrencyExample folder"
2929
cp -R examples/concurrencyExample/src distribution/RealmConcurrencyExample/app
3030

31-
echo "Done"
31+
echo "Copying files to the distribution/RealmAdapterExample folder"
32+
cp -R examples/adapterExample/src distribution/RealmAdapterExample/app
33+
34+
echo "Creating the Eclipse distribution"
35+
mkdir -p distribution/eclipse
36+
cp realm/build/libs/realm-${version}.jar distribution/eclipse
37+
unzip distribution/eclipse/realm-${version}.jar lib/\* -d distribution/eclipse
38+
zip -d distribution/eclipse/realm-${version}.jar lib/\*
39+
mv distribution/eclipse/lib/* distribution/eclipse/
40+
rm -rf distribution/eclipse/lib
41+
42+
echo "Done"

‎build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.12.2'
6+
classpath 'com.android.tools.build:gradle:0.14.0'
77
classpath 'de.undercouch:gradle-download-task:1.0'
88
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
99
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.5' // Version 0.6 seems to require gradle 2.0+
10+
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
1011
}
1112
}
1213

1314
allprojects {
15+
apply plugin: 'android-sdk-manager'
16+
1417
group = 'io.realm'
1518
version = new File("version.txt").text
1619
repositories {

‎changelog.txt‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1-
0.72.0 (??)
2-
* Extending sorting to more types: boolean, short, int, long, float, double, Date,
3-
and String fields are now supported
4-
* Support for directly adding data to Realm using Json.
1+
0.74.0 (??)
2+
* Adding case sensitive versions of string comparison operators equalTo and notEqualTo
3+
4+
5+
0.73.1 (05 Nov 2014)
6+
* Fixed a bug that would send infinite notifications in some instances
7+
8+
0.73.0 (04 Nov 2014)
9+
* Fixed a bug not allowing queries with more than 1024 conditions
10+
* Rewritten the notification system. The API did not change but it's now much more reliable
11+
* Added support for switching auto-refresh on and off (Realm.setAutoRefresh)
12+
* Added RealmBaseAdapter and an example using it
13+
* Added deleteFromRealm() method to RealmObject
14+
15+
0.72.0 (27 Oct 2014)
16+
* Extended sorting support to more types: boolean, byte, short, int, long, float, double, Date, and String
17+
fields are now supported
18+
* Better support for Java 7 and 8 in the annotations processor
19+
* Better support for the Eclipse annotations processor
20+
* Added Eclipse support to the distribution folder
21+
* Added Realm.cancelTransaction() to cancel/abort/rollback a write transaction
22+
* Faster implementation of RealmQuery.findFirst()
23+
* Upgraded core to 0.85.1 (deep copying of strings in queries; preparation for link queries)
24+
* Added support for link queries in the form realm.where(Owner.class).equalTo("cat.age", 12).findAll()
525

626
0.71.0 (07 Oct 2014)
727
* Simplified the release artifact to a single Jar file
@@ -10,7 +30,7 @@
1030
* Throw exception if nested write transactions are used (it's not allowed)
1131
* Javadoc updated
1232
* Fixed bug in RealmResults: https://github.com/realm/realm-java/issues/453
13-
* New annotation @Index to add search index to a field (currently only supporting String fields)
33+
* New annotation @Index to add search index to a field (currently only supporting String fields)
1434
* Made the annotations processor more verbose and strict
1535
* Adding RealmQuery.count() method
1636
* Added a new example about concurrency

‎distribution/RealmAdapterExample/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.gradle
2+
/local.properties
3+
/.idea/workspace.xml
4+
/.idea/libraries
5+
.DS_Store
6+
/build

‎distribution/RealmAdapterExample/app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎distribution/RealmAdapterExample/app/build.gradle‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 20
5+
buildToolsVersion "20.0.0"
6+
7+
defaultConfig {
8+
applicationId "io.realm.examples.realmadapterexample"
9+
minSdkVersion 14
10+
targetSdkVersion 20
11+
versionCode 1
12+
versionName "1.0"
13+
}
14+
buildTypes {
15+
release {
16+
runProguard false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
}
21+
22+
dependencies {
23+
compile 'io.realm:realm-android:0.73.1'
24+
}

‎distribution/RealmAdapterExample/app/proguard-rules.pro‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in /Applications/Android Studio.app/sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

‎distribution/RealmAdapterExample/build.gradle‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
3+
buildscript {
4+
repositories {
5+
jcenter()
6+
}
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:0.14.0'
9+
10+
// NOTE: Do not place your application dependencies here; they belong
11+
// in the individual module build.gradle files
12+
}
13+
}
14+
15+
allprojects {
16+
repositories {
17+
jcenter()
18+
}
19+
}

‎distribution/RealmAdapterExample/gradle.properties‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Settings specified in this file will override any Gradle settings
5+
# configured through the IDE.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true

0 commit comments

Comments
 (0)