Skip to content

Commit d92bd33

Browse files
tonyofrancistonyofrancis
committed
Revert "migrate to android x"
This reverts commit 47f74d3.
1 parent 294e5b1 commit d92bd33

File tree

54 files changed

+139
-138
lines changed

Some content is hidden

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

54 files changed

+139
-138
lines changed

‎.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎fetch2/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929
versionCode library_version_code
3030
versionName library_version
3131

32-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
32+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3333

3434
}
3535

@@ -63,13 +63,13 @@ android {
6363
dependencies {
6464

6565
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
66-
kapt "androidx.room:room-compiler:$room_version"
67-
api "androidx.room:room-runtime:$room_version"
66+
kapt "android.arch.persistence.room:compiler:$room_version"
67+
api "android.arch.persistence.room:runtime:$room_version"
6868
api project(':fetch2core')
6969

7070
testImplementation "junit:junit:$junit_version"
71-
androidTestImplementation "androidx.test:runner:$test_runner_version"
72-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
71+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
72+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
7373
}
7474

7575
//publish {

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DatabaseInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tonyodev.fetch2;
22

33
import android.content.Context;
4-
import androidx.test.InstrumentationRegistry;
5-
import androidx.test.runner.AndroidJUnit4;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
66

77
import com.tonyodev.fetch2.database.DatabaseManager;
88
import com.tonyodev.fetch2.database.DatabaseManagerImpl;

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadManagerInstrumentedTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.content.Context;
44
import android.os.Handler;
55
import android.os.Looper;
6-
import androidx.test.InstrumentationRegistry;
7-
import androidx.test.runner.AndroidJUnit4;
6+
import android.support.test.InstrumentationRegistry;
7+
import android.support.test.runner.AndroidJUnit4;
88

99
import com.tonyodev.fetch2.database.DatabaseManager;
1010
import com.tonyodev.fetch2.database.DatabaseManagerImpl;
@@ -26,6 +26,7 @@
2626
import com.tonyodev.fetch2core.FetchCoreUtils;
2727
import com.tonyodev.fetch2core.FetchLogger;
2828
import com.tonyodev.fetch2core.FileServerDownloader;
29+
import com.tonyodev.fetch2core.HandlerWrapper;
2930

3031
import org.junit.After;
3132
import org.junit.Before;

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadPriorityIteratorProcessorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.os.Handler;
55
import android.os.HandlerThread;
66
import android.os.Looper;
7-
import androidx.test.InstrumentationRegistry;
8-
import androidx.test.runner.AndroidJUnit4;
7+
import android.support.test.InstrumentationRegistry;
8+
import android.support.test.runner.AndroidJUnit4;
99

1010
import com.tonyodev.fetch2.database.DatabaseManager;
1111
import com.tonyodev.fetch2.database.DatabaseManagerImpl;

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/DownloadProviderInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tonyodev.fetch2;
22

33
import android.content.Context;
4-
import androidx.test.InstrumentationRegistry;
5-
import androidx.test.runner.AndroidJUnit4;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
66

77
import com.tonyodev.fetch2.database.DatabaseManager;
88
import com.tonyodev.fetch2.database.DatabaseManagerImpl;

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tonyodev.fetch2;
22

33
import android.content.Context;
4-
import androidx.test.InstrumentationRegistry;
5-
import androidx.test.runner.AndroidJUnit4;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
66

77
import com.tonyodev.fetch2core.FetchLogger;
88

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/FetchHandlerInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.os.Handler;
55
import android.os.HandlerThread;
66
import android.os.Looper;
7-
import androidx.test.InstrumentationRegistry;
8-
import androidx.test.runner.AndroidJUnit4;
7+
import android.support.test.InstrumentationRegistry;
8+
import android.support.test.runner.AndroidJUnit4;
99

1010
import com.tonyodev.fetch2.database.DatabaseManager;
1111
import com.tonyodev.fetch2.database.DatabaseManagerImpl;

‎fetch2/src/androidTest/java/com/tonyodev/fetch2/listenerProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2;
22

3-
import androidx.test.runner.AndroidJUnit4;
3+
import android.support.test.runner.AndroidJUnit4;
44

55
import com.tonyodev.fetch2.fetch.ListenerCoordinator;
66

‎fetch2/src/main/java/com/tonyodev/fetch2/DefaultFetchNotificationManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.content.Intent
66
import android.net.Uri
77
import android.os.Build
88
import android.os.SystemClock
9-
import androidx.core.app.NotificationCompat
9+
import android.support.v4.app.NotificationCompat
1010

1111
import com.tonyodev.fetch2.DownloadNotification.ActionType.*
1212

‎fetch2/src/main/java/com/tonyodev/fetch2/FetchNotificationManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.tonyodev.fetch2
33
import android.app.NotificationManager
44
import android.app.PendingIntent
55
import android.content.Context
6-
import androidx.core.app.NotificationCompat
6+
import android.support.v4.app.NotificationCompat
77

88
/**
99
* Implement this interface to create, maintain and show notifications

‎fetch2/src/main/java/com/tonyodev/fetch2/database/Converter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database
22

3-
import androidx.room.TypeConverter
3+
import android.arch.persistence.room.TypeConverter
44
import com.tonyodev.fetch2.*
55
import com.tonyodev.fetch2.util.EMPTY_JSON_OBJECT_STRING
66
import com.tonyodev.fetch2.NetworkType

‎fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.tonyodev.fetch2.database
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
4-
import androidx.room.Room
3+
import android.arch.persistence.db.SupportSQLiteDatabase
4+
import android.arch.persistence.room.Room
55
import android.content.Context
66
import android.database.sqlite.SQLiteException
77
import com.tonyodev.fetch2.Status

‎fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database
22

3-
import androidx.room.*
3+
import android.arch.persistence.room.*
44
import com.tonyodev.fetch2.Status
55
import com.tonyodev.fetch2.database.DownloadDatabase.Companion.COLUMN_CREATED
66
import com.tonyodev.fetch2.database.DownloadDatabase.Companion.COLUMN_FILE

‎fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadDatabase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tonyodev.fetch2.database
22

3-
import androidx.room.Database
4-
import androidx.room.RoomDatabase
5-
import androidx.room.TypeConverters
3+
import android.arch.persistence.room.Database
4+
import android.arch.persistence.room.RoomDatabase
5+
import android.arch.persistence.room.TypeConverters
66
import com.tonyodev.fetch2.database.DownloadDatabase.Companion.DATABASE_VERSION
77
import com.tonyodev.fetch2.database.migration.*
88

‎fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.tonyodev.fetch2.database
22

3-
import androidx.room.ColumnInfo
4-
import androidx.room.Entity
5-
import androidx.room.Index
6-
import androidx.room.PrimaryKey
3+
import android.arch.persistence.room.ColumnInfo
4+
import android.arch.persistence.room.Entity
5+
import android.arch.persistence.room.Index
6+
import android.arch.persistence.room.PrimaryKey
77
import android.net.Uri
88
import android.os.Parcel
99
import android.os.Parcelable

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/Migration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.room.migration.Migration
3+
import android.arch.persistence.room.migration.Migration
44

55

66
abstract class Migration constructor(startVersion: Int, endVersion: Int)

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFiveToSix.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
3+
import android.arch.persistence.db.SupportSQLiteDatabase
44
import com.tonyodev.fetch2.database.DownloadDatabase
55
import com.tonyodev.fetch2.util.EMPTY_JSON_OBJECT_STRING
66

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationFourToFive.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
3+
import android.arch.persistence.db.SupportSQLiteDatabase
44
import com.tonyodev.fetch2.database.DownloadDatabase
55

66
class MigrationFourToFive : Migration(4, 5) {

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationOneToTwo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
3+
import android.arch.persistence.db.SupportSQLiteDatabase
44
import com.tonyodev.fetch2.database.DownloadDatabase
55

66

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationThreeToFour.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
3+
import android.arch.persistence.db.SupportSQLiteDatabase
44
import com.tonyodev.fetch2.database.DownloadDatabase
55
import com.tonyodev.fetch2.util.DEFAULT_UNIQUE_IDENTIFIER
66

‎fetch2/src/main/java/com/tonyodev/fetch2/database/migration/MigrationTwoToThree.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2.database.migration
22

3-
import androidx.sqlite.db.SupportSQLiteDatabase
3+
import android.arch.persistence.db.SupportSQLiteDatabase
44
import com.tonyodev.fetch2.EnqueueAction
55
import com.tonyodev.fetch2.database.DownloadDatabase
66

‎fetch2core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
versionCode library_version_code
2929
versionName library_version
3030

31-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
31+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3232

3333
}
3434

@@ -59,8 +59,8 @@ dependencies {
5959

6060
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
6161
testImplementation "junit:junit:$junit_version"
62-
androidTestImplementation "androidx.test:runner:$test_runner_version"
63-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
62+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
63+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
6464
}
6565

6666
//publish {

‎fetch2fileserver/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
versionCode library_version_code
2929
versionName library_version
3030

31-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
31+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3232

3333
}
3434

@@ -56,16 +56,16 @@ android {
5656

5757
dependencies {
5858
implementation fileTree(dir: 'libs', include: ['*.jar'])
59-
implementation "androidx.appcompat:appcompat:$android_support_version"
59+
implementation "com.android.support:appcompat-v7:$android_support_version"
6060
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
61-
kapt "androidx.room:room-compiler:$room_version"
62-
api "androidx.room:room-runtime:$room_version"
61+
kapt "android.arch.persistence.room:compiler:$room_version"
62+
api "android.arch.persistence.room:runtime:$room_version"
6363

6464
api project(':fetch2core')
6565

6666
testImplementation "junit:junit:$junit_version"
67-
androidTestImplementation "androidx.test:runner:$test_runner_version"
68-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
67+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
68+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
6969
}
7070

7171
//publish {

‎fetch2fileserver/src/androidTest/java/com/tonyodev/fetch2fileserver/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tonyodev.fetch2fileserver;
22

33
import android.content.Context;
4-
import androidx.test.InstrumentationRegistry;
5-
import androidx.test.runner.AndroidJUnit4;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FetchFileResourceInfoDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2fileserver.database
22

3-
import androidx.room.*
3+
import android.arch.persistence.room.*
44
import android.content.Context
55
import java.io.Closeable
66

‎fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfo.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.tonyodev.fetch2fileserver.database
22

3-
import androidx.room.ColumnInfo
4-
import androidx.room.Entity
5-
import androidx.room.Index
6-
import androidx.room.PrimaryKey
3+
import android.arch.persistence.room.ColumnInfo
4+
import android.arch.persistence.room.Entity
5+
import android.arch.persistence.room.Index
6+
import android.arch.persistence.room.PrimaryKey
77

88
@Entity(tableName = FileResourceInfoDatabase.TABLE_NAME,
99
indices = [(Index(value = [FileResourceInfoDatabase.COLUMN_NAME], unique = true)),

‎fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.tonyodev.fetch2fileserver.database
22

3-
import androidx.room.*
3+
import android.arch.persistence.room.*
44
import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.COLUMN_ID
55
import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.COLUMN_NAME
66
import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.TABLE_NAME

‎fetch2fileserver/src/main/java/com/tonyodev/fetch2fileserver/database/FileResourceInfoDatabase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.tonyodev.fetch2fileserver.database
22

3-
import androidx.room.Database
4-
import androidx.room.RoomDatabase
3+
import android.arch.persistence.room.Database
4+
import android.arch.persistence.room.RoomDatabase
55
import com.tonyodev.fetch2fileserver.database.FileResourceInfoDatabase.Companion.DATABASE_VERSION
66

77
@Database(entities = [FileResourceInfo::class], version = DATABASE_VERSION, exportSchema = false)

‎fetch2okhttp/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
versionCode library_version_code
2828
versionName library_version
2929

30-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
30+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3131

3232
}
3333

@@ -66,8 +66,8 @@ dependencies {
6666
api project(':fetch2core')
6767

6868
testImplementation "junit:junit:$junit_version"
69-
androidTestImplementation "androidx.test:runner:$test_runner_version"
70-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
69+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
70+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
7171
}
7272

7373
//publish {

‎fetch2rx/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
versionCode library_version_code
2727
versionName library_version
2828

29-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030

3131
}
3232

@@ -61,8 +61,8 @@ dependencies {
6161
api project(':fetch2')
6262

6363
testImplementation "junit:junit:$junit_version"
64-
androidTestImplementation "androidx.test:runner:$test_runner_version"
65-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
64+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
65+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
6666
}
6767

6868
//publish {

‎fetchmigrator/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
versionCode library_version_code
2727
versionName library_version
2828

29-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030

3131
}
3232

@@ -59,8 +59,9 @@ dependencies {
5959
api project(':fetch2')
6060

6161
testImplementation "junit:junit:$junit_version"
62-
androidTestImplementation "androidx.test:runner:$test_runner_version"
63-
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
62+
63+
androidTestImplementation "com.android.support.test:runner:$test_runner_version"
64+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
6465
}
6566

6667
//publish {

0 commit comments

Comments
 (0)