Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Room to androidx #173

Closed
wants to merge 1 commit into from
Closed

Update Room to androidx #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debug-db-base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {

dependencies {
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'android.arch.persistence.room:runtime:1.1.1'
implementation 'androidx.sqlite:sqlite:2.0.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
3 changes: 2 additions & 1 deletion debug-db-base/src/main/java/com/amitshekhar/DebugDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@

package com.amitshekhar;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.Context;
import android.util.Log;
import android.util.Pair;

import androidx.sqlite.db.SupportSQLiteDatabase;

import com.amitshekhar.server.ClientServer;
import com.amitshekhar.sqlite.DBFactory;
import com.amitshekhar.utils.NetworkUtils;
Expand Down
3 changes: 2 additions & 1 deletion debug-db-base/src/main/java/com/amitshekhar/server/ClientServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
* Created by amitshekhar on 15/11/16.
*/

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.Context;
import android.util.Log;
import android.util.Pair;

import androidx.sqlite.db.SupportSQLiteDatabase;

import com.amitshekhar.sqlite.DBFactory;

import java.io.File;
Expand Down
3 changes: 2 additions & 1 deletion debug-db-base/src/main/java/com/amitshekhar/server/RequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@

package com.amitshekhar.server;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.Context;
import android.content.res.AssetManager;
import android.net.Uri;
import android.text.TextUtils;
import android.util.Pair;

import androidx.sqlite.db.SupportSQLiteDatabase;

import com.amitshekhar.model.Response;
import com.amitshekhar.model.RowDataRequest;
import com.amitshekhar.model.TableDataResponse;
Expand Down
3 changes: 2 additions & 1 deletion debug-db-base/src/main/java/com/amitshekhar/sqlite/InMemoryDebugSQLiteDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.amitshekhar.sqlite;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.ContentValues;
import android.database.Cursor;
import android.database.SQLException;

import androidx.sqlite.db.SupportSQLiteDatabase;

/**
* Created by anandgaurav on 12/02/18.
*/
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
6 changes: 3 additions & 3 deletions sample-app-encrypt/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ android {

dependencies {
debugImplementation project(':debug-db-encrypt')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.room:room-runtime:2.2.1'
annotationProcessor 'androidx.room:room-compiler:2.2.1'
implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
implementation 'android.arch.persistence.room:runtime:1.1.1'
annotationProcessor 'android.arch.persistence.room:compiler:1.1.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
3 changes: 2 additions & 1 deletion sample-app-encrypt/src/main/java/com/sample/encrypt/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import androidx.appcompat.app.AppCompatActivity;

import com.sample.encrypt.database.CarDBHelper;
import com.sample.encrypt.database.ContactDBHelper;
import com.sample.encrypt.database.ExtTestDBHelper;
Expand Down
4 changes: 2 additions & 2 deletions sample-app-encrypt/src/main/java/com/sample/encrypt/database/room/AppDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sample.encrypt.database.room;

import android.arch.persistence.room.Database;
import android.arch.persistence.room.RoomDatabase;
import androidx.room.Database;
import androidx.room.RoomDatabase;

/**
* Created by anandgaurav on 12/02/18.
Expand Down
4 changes: 2 additions & 2 deletions sample-app-encrypt/src/main/java/com/sample/encrypt/database/room/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sample.encrypt.database.room;

import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
import androidx.room.Entity;
import androidx.room.PrimaryKey;

/**
* Created by anandgaurav on 12/02/18.
Expand Down
5 changes: 3 additions & 2 deletions sample-app-encrypt/src/main/java/com/sample/encrypt/database/room/UserDBHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.sample.encrypt.database.room;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Room;
import android.content.Context;

import androidx.room.Room;
import androidx.sqlite.db.SupportSQLiteDatabase;

import java.util.List;

/**
Expand Down
10 changes: 5 additions & 5 deletions sample-app-encrypt/src/main/java/com/sample/encrypt/database/room/UserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.sample.encrypt.database.room;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;

import java.util.List;

Expand Down
3 changes: 2 additions & 1 deletion sample-app-encrypt/src/main/java/com/sample/encrypt/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@

package com.sample.encrypt.utils;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.Context;
import android.util.Pair;
import android.widget.Toast;

import androidx.sqlite.db.SupportSQLiteDatabase;

import com.sample.encrypt.BuildConfig;
import com.sample.encrypt.database.ExtTestDBHelper;

Expand Down
6 changes: 3 additions & 3 deletions sample-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ android {

dependencies {
debugImplementation project(':debug-db')
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'android.arch.persistence.room:runtime:1.1.1'
annotationProcessor 'android.arch.persistence.room:compiler:1.1.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.room:room-runtime:2.2.1'
annotationProcessor 'androidx.room:room-compiler:2.2.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
3 changes: 2 additions & 1 deletion sample-app/src/main/java/com/sample/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import androidx.appcompat.app.AppCompatActivity;

import com.sample.database.CarDBHelper;
import com.sample.database.ContactDBHelper;
import com.sample.database.ExtTestDBHelper;
Expand Down
4 changes: 2 additions & 2 deletions sample-app/src/main/java/com/sample/database/room/AppDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sample.database.room;

import android.arch.persistence.room.Database;
import android.arch.persistence.room.RoomDatabase;
import androidx.room.Database;
import androidx.room.RoomDatabase;

/**
* Created by anandgaurav on 12/02/18.
Expand Down
4 changes: 2 additions & 2 deletions sample-app/src/main/java/com/sample/database/room/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sample.database.room;

import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
import androidx.room.Entity;
import androidx.room.PrimaryKey;

/**
* Created by anandgaurav on 12/02/18.
Expand Down
5 changes: 3 additions & 2 deletions sample-app/src/main/java/com/sample/database/room/UserDBHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package com.sample.database.room;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Room;
import android.content.Context;

import androidx.room.Room;
import androidx.sqlite.db.SupportSQLiteDatabase;

import java.util.List;

/**
Expand Down
10 changes: 5 additions & 5 deletions sample-app/src/main/java/com/sample/database/room/UserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.sample.database.room;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;

import java.util.List;

Expand Down
3 changes: 2 additions & 1 deletion sample-app/src/main/java/com/sample/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@

package com.sample.utils;

import android.arch.persistence.db.SupportSQLiteDatabase;
import android.content.Context;
import android.util.Pair;
import android.widget.Toast;

import androidx.sqlite.db.SupportSQLiteDatabase;

import com.sample.BuildConfig;
import com.sample.database.ExtTestDBHelper;

Expand Down