Skip to content

Commit afe18e8

Browse files
Update build tool version
2 parents e5dd4bf + e3c5471 commit afe18e8

File tree

10 files changed

+27
-41
lines changed

10 files changed

+27
-41
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Change Log
22
==========
33

4+
Version 1.0.4 *(2018-06-23)*
5+
----------------------------
6+
7+
* Fix: Fix issue of Room Database
8+
9+
410
Version 1.0.3 *(2018-02-12)*
511
----------------------------
612

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
[![Mindorks](https://img.shields.io/badge/mindorks-opensource-blue.svg)](https://mindorks.com/open-source-projects)
66
[![Mindorks Community](https://img.shields.io/badge/join-community-blue.svg)](https://mindorks.com/join-community)
7-
[![Android Weekly](https://img.shields.io/badge/Android%20Weekly-%23233-blue.svg)](http://androidweekly.net/issues/issue-233)
8-
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20Debug%20Database-blue.svg?style=flat)](http://android-arsenal.com/details/1/4667)
7+
[![Mindorks Android Store](https://img.shields.io/badge/Mindorks%20Android%20Store-Android%20Debug%20Database-blue.svg?style=flat)](https://mindorks.com/android/store)
98
[![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
109
[![Download](https://api.bintray.com/packages/amitshekhariitbhu/maven/debug-db/images/download.svg) ](https://bintray.com/amitshekhariitbhu/maven/debug-db/_latestVersion)
1110
[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/Apache-2.0)
@@ -37,7 +36,7 @@
3736
### Using Android Debug Database Library in your application
3837
Add this to your app's build.gradle
3938
```groovy
40-
debugImplementation 'com.amitshekhar.android:debug-db:1.0.3'
39+
debugImplementation 'com.amitshekhar.android:debug-db:1.0.4'
4140
```
4241

4342
Use `debugImplementation` so that it will only compile in your debug build and not in your release build.

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
apply plugin: 'com.android.application'
2121

2222
android {
23-
compileSdkVersion 27
24-
buildToolsVersion '25.0.3'
23+
compileSdkVersion 28
24+
buildToolsVersion '28.0.3'
2525
defaultConfig {
2626
applicationId "com.sample"
2727
minSdkVersion 15
28-
targetSdkVersion 27
28+
targetSdkVersion 28
2929
versionCode 1
3030
versionName "1.0"
3131
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -47,10 +47,10 @@ dependencies {
4747
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
4848
exclude group: 'com.android.support', module: 'support-annotations'
4949
})
50-
implementation 'com.android.support:appcompat-v7:27.0.0'
50+
implementation 'com.android.support:appcompat-v7:28.0.0'
5151
testImplementation 'junit:junit:4.12'
5252
implementation 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
53-
implementation "android.arch.persistence.room:runtime:1.0.0"
54-
annotationProcessor "android.arch.persistence.room:compiler:1.0.0"
53+
implementation "android.arch.persistence.room:runtime:1.1.1"
54+
annotationProcessor "android.arch.persistence.room:compiler:1.1.1"
5555
debugImplementation project(':debug-db')
5656
}

app/src/main/java/com/sample/database/room/AppDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/**
77
* Created by anandgaurav on 12/02/18.
88
*/
9-
@Database(entities = {User.class}, version = 1)
9+
@Database(entities = {User.class}, version = 1, exportSchema = false)
1010
public abstract class AppDatabase extends RoomDatabase {
1111

1212
public abstract UserDao userDao();

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildscript {
2525
google()
2626
}
2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:3.0.1'
28+
classpath 'com.android.tools.build:gradle:3.2.1'
2929
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
3030
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
3131

debug-db/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
apply plugin: 'com.android.library'
2121

2222
android {
23-
compileSdkVersion 27
24-
buildToolsVersion '25.0.3'
23+
compileSdkVersion 28
24+
buildToolsVersion '28.0.3'
2525

2626
defaultConfig {
2727
minSdkVersion 14
28-
targetSdkVersion 27
28+
targetSdkVersion 28
2929
versionCode 1
3030
versionName "1.0"
3131

@@ -48,11 +48,10 @@ dependencies {
4848
exclude group: 'com.android.support', module: 'support-annotations'
4949
})
5050
testImplementation 'junit:junit:4.12'
51-
implementation 'com.google.code.gson:gson:2.8.0'
51+
implementation 'com.google.code.gson:gson:2.8.5'
5252
implementation 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
53-
implementation "android.arch.persistence.room:runtime:1.0.0"
54-
implementation 'com.android.support:appcompat-v7:27.0.0'
55-
53+
implementation "android.arch.persistence.room:runtime:1.1.1"
54+
implementation 'com.android.support:appcompat-v7:28.0.0'
5655
}
5756

5857
//apply from: 'debug-db-upload.gradle'

debug-db/debug-db-upload.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def siteUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database'
2424
def gitUrl = 'https://github.com/amitshekhariitbhu/Android-Debug-Database.git'
2525

2626
group = "com.amitshekhar.android"
27-
version = '1.0.3'
27+
version = '1.0.4'
2828

2929
install {
3030
repositories.mavenInstaller {

debug-db/src/main/assets/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function getDBList() {
111111
var isEncrypted = dbList[count][1];
112112
var isDownloadable = dbList[count][2];
113113
var dbAttribute = isEncrypted == "true" ? ' <span class="glyphicon glyphicon-lock" aria-hidden="true" style="color:blue"></span>' : "";
114-
if(dbName.indexOf("journal") == -1){
114+
if(dbName.indexOf("journal") == -1 && dbName.indexOf("-wal") == -1 && dbName.indexOf("-shm") == -1){
115115
$("#db-list").append("<a href='#' id=" + dbName + " class='list-group-item' onClick='openDatabaseAndGetTableList(\""+ dbName + "\", \""+ isDownloadable + "\");'>" + dbName + dbAttribute + "</a>");
116116
if(!isSelectionDone){
117117
isSelectionDone = true;

debug-db/src/main/java/com/amitshekhar/DebugDBInitProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public boolean onCreate() {
4848
Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
4949
//ask for permission
5050
Intent intent = new Intent(getContext(), RequestPermissionsActivity.class);
51+
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
5152
getContext().startActivity(intent);
5253
}
5354
}
Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
1-
#
2-
# /*
3-
# * Copyright (C) 2016 Amit Shekhar
4-
# * Copyright (C) 2011 Android Open Source Project
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-
# * http://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-
# */
18-
#
19-
20-
#Mon Dec 28 10:00:20 PST 2015
1+
#Fri Jan 18 16:59:40 IST 2019
212
distributionBase=GRADLE_USER_HOME
223
distributionPath=wrapper/dists
234
zipStoreBase=GRADLE_USER_HOME
245
zipStorePath=wrapper/dists
25-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)