Skip to content

Commit 192a632

Browse files
committed
Merge branch 'release/v0.4.0'
2 parents 1b94653 + cf262c5 commit 192a632

File tree

9 files changed

+55
-22
lines changed

9 files changed

+55
-22
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ SnappyDB uses native code for performance, it's available as an [Android Library
4949

5050
```groovy
5151
dependencies {
52-
compile 'com.snappydb:snappydb-lib:0.4.+'
52+
compile 'com.snappydb:snappydb-lib:0.4.0'
5353
compile 'com.esotericsoftware.kryo:kryo:2.24.0'
5454
}
5555
```

snappydb-snippets/app/build.gradle

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
maven { url 'http://download.crashlytics.com/maven' }
5+
}
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:0.12.1'
8+
classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
9+
}
10+
}
11+
12+
repositories {
13+
jcenter()
14+
maven { url 'http://download.crashlytics.com/maven' }
15+
}
16+
117
apply plugin: 'com.android.application'
18+
apply plugin: 'crashlytics'
219

320
android {
421
compileSdkVersion 19
@@ -12,10 +29,16 @@ android {
1229
versionName "1.0"
1330
}
1431

32+
signingConfigs {
33+
release {
34+
}
35+
}
36+
1537
buildTypes {
1638
release {
1739
runProguard false
1840
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
41+
signingConfig signingConfigs.release
1942
}
2043
}
2144

@@ -26,11 +49,31 @@ android {
2649
}
2750

2851
dependencies {
29-
compile 'com.snappydb:snappydb-lib:0.4.+'
52+
compile 'com.snappydb:snappydb-lib:0.4.0'
3053
compile 'com.esotericsoftware.kryo:kryo:2.24.0'
3154
compile 'com.android.support:appcompat-v7:20.0.0'
55+
compile 'com.crashlytics.android:crashlytics:1.+'
3256
}
3357

58+
File propFile = file('signing.properties');
59+
if (propFile.exists()) {
60+
def Properties props = new Properties()
61+
props.load(new FileInputStream(propFile))
62+
63+
if (props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') &&
64+
props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) {
65+
android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
66+
android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
67+
android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
68+
android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
69+
} else {
70+
android.buildTypes.release.signingConfig = null
71+
}
72+
} else {
73+
android.buildTypes.release.signingConfig = null
74+
}
75+
76+
3477
task wrapper(type: Wrapper) {
3578
gradleVersion = '1.12'
3679
}

snappydb-snippets/app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,19 @@ limitations under the License.
1717
package="com.snappydb.snippets.app" >
1818

1919
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
20+
<uses-permission android:name="android.permission.INTERNET"/>
2021

2122
<application
2223
android:allowBackup="true"
2324
android:icon="@drawable/ic_launcher"
2425
android:label="@string/app_name">
2526

27+
!-- 3rd Party Libraries -->
28+
<meta-data
29+
android:name="com.crashlytics.ApiKey"
30+
android:value="495cb7d8ea2661a24b8ca53ca19612f9ab22f206" />
31+
32+
2633
<activity
2734
android:theme="@style/Theme.AppCompat.Light"
2835
android:name=".activity.MainActivity"

snappydb-snippets/app/src/main/java/com/snappydb/snippets/app/activity/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import android.webkit.WebView;
2929
import android.widget.ExpandableListView;
3030

31+
import com.crashlytics.android.Crashlytics;
3132
import com.snappydb.snippets.app.R;
3233
import com.snappydb.snippets.app.adapter.ExpandableListAdapter;
3334
import com.snappydb.snippets.app.model.Snippet;
@@ -43,6 +44,8 @@ protected void onCreate(Bundle savedInstanceState) {
4344
super.onCreate(savedInstanceState);
4445
setContentView(R.layout.main);
4546

47+
Crashlytics.start(this);
48+
4649
TreeMap<String, ArrayList<Snippet>> snippets = SnippetsFactory.INSTANCE.getSnippets();
4750

4851
ExpandableListView expandableListView = (ExpandableListView) findViewById(R.id.categories);
43.9 KB
Loading
94.5 KB
Loading
94.6 KB
Loading
106 KB
Loading

snappydb-snippets/build.gradle

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)