Merge pull request #5 from whisp-internet/develop

ubuntudroid · web-flow · commit 1e636185defa · 2020-11-27T13:35:59.000+01:00
2.1.0
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -32,7 +32,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -52,8 +52,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(":core")
 
-    implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    testImplementation 'junit:junit:4.13.1'
 
     compileOnly 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.0'
-    ext.okhttp_version = '4.8.1'
+    ext.kotlin_version = '1.4.20'
+    ext.okhttp_version = '4.9.0'
     repositories {
         google()
         jcenter()
@@ -33,7 +33,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0-alpha07'
+        classpath 'com.android.tools.build:gradle:4.2.0-alpha15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.3.0"
 
diff --git a/cache/build.gradle b/cache/build.gradle
@@ -32,7 +32,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -52,6 +52,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(":core")
 
-    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/cache/src/main/java/io/stanwood/framework/network/cache/CacheInterceptor.java b/cache/src/main/java/io/stanwood/framework/network/cache/CacheInterceptor.java
@@ -23,8 +23,10 @@
 package io.stanwood.framework.network.cache;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -78,11 +80,12 @@ public CacheInterceptor(
         this.errorCallback = errorCallback;
     }
 
+    @NotNull
     @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
         Request request = chain.request();
         String offlineCacheHeader = request.header(CacheHeaderKeys.APPLY_OFFLINE_CACHE);
-        if (Boolean.valueOf(offlineCacheHeader) && !connectionState.isConnected()) {
+        if (Boolean.parseBoolean(offlineCacheHeader) && !connectionState.isConnected()) {
             Request.Builder builder = request.newBuilder();
             if (queryAuthParameterKey != null) {
                 builder.url(request
@@ -100,7 +103,7 @@ public Response intercept(@NonNull Chain chain) throws IOException {
         }
 
         String responseCacheHeader = request.header(CacheHeaderKeys.REFRESH);
-        if (Boolean.valueOf(responseCacheHeader)) {
+        if (Boolean.parseBoolean(responseCacheHeader)) {
             try {
                 return chain.proceed(request.newBuilder().cacheControl(CacheControl.FORCE_NETWORK).build());
             } catch (IOException e) {
diff --git a/cache/src/main/java/io/stanwood/framework/network/cache/CacheNetworkInterceptor.java b/cache/src/main/java/io/stanwood/framework/network/cache/CacheNetworkInterceptor.java
@@ -22,8 +22,10 @@
 
 package io.stanwood.framework.network.cache;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -80,13 +82,14 @@ public CacheNetworkInterceptor(@Nullable String queryAuthParameterKey, long cach
         this.cacheForSeconds = cacheForSeconds;
     }
 
+    @NotNull
     @Override
     public Response intercept(@NonNull Chain chain) throws IOException {
         Request request = chain.request();
         String responseCacheHeader = request.header(CacheHeaderKeys.APPLY_RESPONSE_CACHE);
         String offlineCacheHeader = request.header(CacheHeaderKeys.APPLY_OFFLINE_CACHE);
-        boolean isGeneralCache = Boolean.valueOf(responseCacheHeader);
-        boolean isOfflineCache = Boolean.valueOf(offlineCacheHeader);
+        boolean isGeneralCache = Boolean.parseBoolean(responseCacheHeader);
+        boolean isOfflineCache = Boolean.parseBoolean(offlineCacheHeader);
         if (isGeneralCache || isOfflineCache) {
             Response originalResponse = chain.proceed(request);
             Response.Builder builder = originalResponse.newBuilder();
diff --git a/core/build.gradle b/core/build.gradle
@@ -32,7 +32,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -51,13 +51,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    testImplementation 'junit:junit:4.13.1'
 
     api "com.squareup.okhttp3:okhttp:$okhttp_version"
     compileOnly 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    api 'org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC'
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
     api 'com.nytimes.android:store3:3.1.1'
     api 'com.nytimes.android:filesystem3:3.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.3' // same version as defined within store
diff --git a/core/src/main/java/io/stanwood/framework/network/core/store/SerializationParserFactory.kt b/core/src/main/java/io/stanwood/framework/network/core/store/SerializationParserFactory.kt
@@ -24,7 +24,6 @@ package io.stanwood.framework.network.core.store
 import com.nytimes.android.external.store3.base.Parser
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import okio.BufferedSource
 import java.io.Reader
 
diff --git a/gradle.properties b/gradle.properties
@@ -31,6 +31,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.7-bin.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -35,7 +35,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -57,10 +57,10 @@ dependencies {
     implementation project(':auth')
     implementation project(':cache')
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/sample/src/androidTest/java/com/github/ubuntudroid/sample/ExampleInstrumentedTest.java b/sample/src/androidTest/java/com/github/ubuntudroid/sample/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.github.ubuntudroid.sample;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("com.github.ubuntudroid.sample", appContext.getPackageName());
     }
diff --git a/sample/src/main/java/com/github/ubuntudroid/sample/MainActivity.java b/sample/src/main/java/com/github/ubuntudroid/sample/MainActivity.java
@@ -22,7 +22,7 @@
 
 package com.github.ubuntudroid.sample;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 /**
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
   ~ SOFTWARE.
   -->
 
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -37,4 +37,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`versionCode 1`
`33`	`33`	`versionName "1.0"`
`34`	`34`
`35`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
	`35`	`+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`36`	`36`
`37`	`37`	`}`
`38`	`38`
`@@ -52,6 +52,6 @@ dependencies {`
`52`	`52`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`53`	`53`	`api project(":core")`
`54`	`54`
`55`		`- implementation 'com.android.support:support-annotations:28.0.0'`
	`55`	`+ implementation 'androidx.annotation:annotation:1.1.0'`
`56`	`56`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`57`	`57`	`}`