Skip to content

Commit fdd0476

Browse files
Merge pull request #229 from azhon/development
Migrate to Androidx and Config upload to maven central
2 parents 67d18bb + 62ffed8 commit fdd0476

35 files changed

+195
-407
lines changed

build.gradle

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,17 @@
1717
*
1818
*/
1919

20-
buildscript {
21-
repositories {
22-
google()
23-
jcenter()
24-
}
25-
dependencies {
26-
classpath 'com.android.tools.build:gradle:3.3.1'
27-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
28-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
29-
}
30-
}
31-
32-
allprojects {
33-
repositories {
34-
google()
35-
jcenter()
36-
}
20+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
21+
plugins {
22+
id 'com.android.application' version '7.3.0' apply false
23+
id 'com.android.library' version '7.3.0' apply false
3724
}
3825

3926
task clean(type: Delete) {
4027
delete rootProject.buildDir
4128
}
29+
ext {
30+
compileSdk = 33
31+
targetSdk = 33
32+
minSdk = 14
33+
}

debug-db-base/build.gradle

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

2222
android {
23-
compileSdkVersion 28
23+
compileSdk rootProject.ext.compileSdk
2424
defaultConfig {
25-
minSdkVersion 14
26-
targetSdkVersion 28
25+
minSdk rootProject.ext.minSdk
26+
targetSdk rootProject.ext.targetSdk
2727
versionCode 1
2828
versionName "1.0"
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
resValue("string", "PORT_NUMBER", "8080")
3131
}
3232
buildTypes {
@@ -39,10 +39,10 @@ android {
3939

4040
dependencies {
4141
implementation 'com.google.code.gson:gson:2.8.5'
42-
implementation 'android.arch.persistence.room:runtime:1.1.1'
43-
testImplementation 'junit:junit:4.12'
44-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
45-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
42+
implementation "androidx.room:room-runtime:2.5.0"
43+
testImplementation 'junit:junit:4.13.2'
44+
androidTestImplementation 'androidx.test:runner:1.5.2'
45+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
4646
}
4747

4848
//apply from: 'debug-db-base-upload.gradle'

debug-db-base/debug-db-base-upload.gradle

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

debug-db-base/src/main/java/com/amitshekhar/DebugDB.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919

2020
package com.amitshekhar;
2121

22-
import android.arch.persistence.db.SupportSQLiteDatabase;
2322
import android.content.Context;
2423
import android.util.Log;
2524
import android.util.Pair;
2625

26+
import androidx.sqlite.db.SupportSQLiteDatabase;
27+
2728
import com.amitshekhar.server.ClientServer;
2829
import com.amitshekhar.sqlite.DBFactory;
2930
import com.amitshekhar.utils.NetworkUtils;

debug-db-base/src/main/java/com/amitshekhar/server/ClientServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
* Created by amitshekhar on 15/11/16.
2424
*/
2525

26-
import android.arch.persistence.db.SupportSQLiteDatabase;
2726
import android.content.Context;
2827
import android.util.Log;
2928
import android.util.Pair;
3029

30+
import androidx.sqlite.db.SupportSQLiteDatabase;
31+
3132
import com.amitshekhar.sqlite.DBFactory;
3233

3334
import java.io.File;

debug-db-base/src/main/java/com/amitshekhar/server/RequestHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919

2020
package com.amitshekhar.server;
2121

22-
import android.arch.persistence.db.SupportSQLiteDatabase;
2322
import android.content.Context;
2423
import android.content.res.AssetManager;
2524
import android.net.Uri;
2625
import android.text.TextUtils;
2726
import android.util.Pair;
2827

28+
import androidx.sqlite.db.SupportSQLiteDatabase;
29+
2930
import com.amitshekhar.model.Response;
3031
import com.amitshekhar.model.RowDataRequest;
3132
import com.amitshekhar.model.TableDataResponse;

debug-db-base/src/main/java/com/amitshekhar/sqlite/InMemoryDebugSQLiteDB.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.amitshekhar.sqlite;
22

3-
import android.arch.persistence.db.SupportSQLiteDatabase;
43
import android.content.ContentValues;
54
import android.database.Cursor;
65
import android.database.SQLException;
76

7+
import androidx.sqlite.db.SupportSQLiteDatabase;
8+
89
/**
910
* Created by anandgaurav on 12/02/18.
1011
*/

debug-db-encrypt/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.library'
2+
apply from: '../maven.gradle'
23

34
android {
4-
compileSdkVersion 28
5+
compileSdk rootProject.ext.compileSdk
56
defaultConfig {
6-
minSdkVersion 14
7-
targetSdkVersion 28
7+
minSdk rootProject.ext.minSdk
8+
targetSdk rootProject.ext.targetSdk
89
versionCode 1
910
versionName "1.0"
10-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1112
}
1213
buildTypes {
1314
release {
@@ -20,9 +21,9 @@ android {
2021
dependencies {
2122
api project(':debug-db-base')
2223
implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
23-
testImplementation 'junit:junit:4.12'
24-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
25-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
24+
testImplementation 'junit:junit:4.13.2'
25+
androidTestImplementation 'androidx.test:runner:1.5.2'
26+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
2627
}
2728

2829
//apply from: 'debug-db-encrypt-upload.gradle'

debug-db-encrypt/debug-db-encrypt-upload.gradle

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

debug-db-encrypt/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ARTIFACT_ID=debug-db-enncrypt

0 commit comments

Comments
 (0)