From 07ca37c6ef3f888e38fed98ff1dbbf1e5fa9d3d4 Mon Sep 17 00:00:00 2001 From: Ayush Date: Sun, 12 Jul 2020 10:04:08 +0530 Subject: [PATCH] update: Migrate to AndroidX, gradle plugin, Android_SDK_30, --- .../.idea/caches/build_file_checksums.ser | Bin 0 -> 533 bytes .../.idea/codeStyles/Project.xml | 116 ++++++++++++++++++ BroadcastWidgetExample/.idea/gradle.xml | 2 + .../.idea/jarRepositories.xml | 40 ++++++ BroadcastWidgetExample/.idea/misc.xml | 15 +-- BroadcastWidgetExample/.idea/modules.xml | 2 + BroadcastWidgetExample/app/build.gradle | 16 +-- .../ExampleInstrumentedTest.java | 4 +- .../broadcastwidgetexample/MainActivity.java | 2 +- BroadcastWidgetExample/build.gradle | 4 +- BroadcastWidgetExample/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../.idea/caches/build_file_checksums.ser | Bin 0 -> 533 bytes .../.idea/codeStyles/Project.xml | 116 ++++++++++++++++++ ConfigurableWidgetExample/.idea/gradle.xml | 2 + .../.idea/jarRepositories.xml | 40 ++++++ ConfigurableWidgetExample/.idea/misc.xml | 2 +- ConfigurableWidgetExample/.idea/modules.xml | 2 + ConfigurableWidgetExample/app/build.gradle | 15 ++- .../ExampleInstrumentedTest.java | 4 +- .../MainActivity.java | 2 +- ConfigurableWidgetExample/build.gradle | 4 +- ConfigurableWidgetExample/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../.idea/caches/build_file_checksums.ser | Bin 0 -> 533 bytes .../.idea/codeStyles/Project.xml | 116 ++++++++++++++++++ SimpleWidgetExample/.idea/gradle.xml | 2 + SimpleWidgetExample/.idea/jarRepositories.xml | 40 ++++++ SimpleWidgetExample/.idea/misc.xml | 22 +++- SimpleWidgetExample/.idea/modules.xml | 4 +- SimpleWidgetExample/app/build.gradle | 15 ++- .../ExampleInstrumentedTest.java | 4 +- .../simplewidgetexample/MainActivity.java | 2 +- SimpleWidgetExample/build.gradle | 4 +- SimpleWidgetExample/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../.idea/caches/build_file_checksums.ser | Bin 0 -> 533 bytes .../.idea/codeStyles/Project.xml | 116 ++++++++++++++++++ UpdatingWidgetExample/.idea/gradle.xml | 2 + .../.idea/jarRepositories.xml | 40 ++++++ UpdatingWidgetExample/.idea/misc.xml | 31 +++-- UpdatingWidgetExample/.idea/modules.xml | 9 ++ UpdatingWidgetExample/.idea/vcs.xml | 6 + UpdatingWidgetExample/app/build.gradle | 15 ++- .../ExampleInstrumentedTest.java | 4 +- .../updatingwidgetexample/MainActivity.java | 2 +- .../updatingwidgetexample/UpdateService.java | 2 +- UpdatingWidgetExample/build.gradle | 4 +- UpdatingWidgetExample/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 4 +- 50 files changed, 760 insertions(+), 92 deletions(-) create mode 100644 BroadcastWidgetExample/.idea/caches/build_file_checksums.ser create mode 100644 BroadcastWidgetExample/.idea/codeStyles/Project.xml create mode 100644 BroadcastWidgetExample/.idea/jarRepositories.xml create mode 100644 ConfigurableWidgetExample/.idea/caches/build_file_checksums.ser create mode 100644 ConfigurableWidgetExample/.idea/codeStyles/Project.xml create mode 100644 ConfigurableWidgetExample/.idea/jarRepositories.xml create mode 100644 SimpleWidgetExample/.idea/caches/build_file_checksums.ser create mode 100644 SimpleWidgetExample/.idea/codeStyles/Project.xml create mode 100644 SimpleWidgetExample/.idea/jarRepositories.xml create mode 100644 UpdatingWidgetExample/.idea/caches/build_file_checksums.ser create mode 100644 UpdatingWidgetExample/.idea/codeStyles/Project.xml create mode 100644 UpdatingWidgetExample/.idea/jarRepositories.xml create mode 100644 UpdatingWidgetExample/.idea/modules.xml create mode 100644 UpdatingWidgetExample/.idea/vcs.xml diff --git a/BroadcastWidgetExample/.idea/caches/build_file_checksums.ser b/BroadcastWidgetExample/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..0e56a5c48d53acdf0c6555c10cd7b9ef4b0e1b55 GIT binary patch literal 533 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}QPHR4k|6t3^s#%y|Baohpn1?|hDwj51^yokDgge3 Bxi + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/BroadcastWidgetExample/.idea/gradle.xml b/BroadcastWidgetExample/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/BroadcastWidgetExample/.idea/gradle.xml +++ b/BroadcastWidgetExample/.idea/gradle.xml @@ -1,8 +1,10 @@ + - - - - - - - - - - - + - - $USER_HOME$/.subversion - diff --git a/BroadcastWidgetExample/.idea/modules.xml b/BroadcastWidgetExample/.idea/modules.xml index 4edb122..1bdfcc8 100644 --- a/BroadcastWidgetExample/.idea/modules.xml +++ b/BroadcastWidgetExample/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/BroadcastWidgetExample/app/build.gradle b/BroadcastWidgetExample/app/build.gradle index 95773b6..99a1d41 100644 --- a/BroadcastWidgetExample/app/build.gradle +++ b/BroadcastWidgetExample/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.0" + compileSdkVersion 30 + defaultConfig { applicationId "com.erenutku.broadcastwidgetexample" minSdkVersion 17 - targetSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,10 +20,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' } diff --git a/BroadcastWidgetExample/app/src/androidTest/java/com/erenutku/broadcastwidgetexample/ExampleInstrumentedTest.java b/BroadcastWidgetExample/app/src/androidTest/java/com/erenutku/broadcastwidgetexample/ExampleInstrumentedTest.java index e9eb4c1..d580da3 100644 --- a/BroadcastWidgetExample/app/src/androidTest/java/com/erenutku/broadcastwidgetexample/ExampleInstrumentedTest.java +++ b/BroadcastWidgetExample/app/src/androidTest/java/com/erenutku/broadcastwidgetexample/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.erenutku.broadcastwidgetexample; 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; diff --git a/BroadcastWidgetExample/app/src/main/java/com/erenutku/broadcastwidgetexample/MainActivity.java b/BroadcastWidgetExample/app/src/main/java/com/erenutku/broadcastwidgetexample/MainActivity.java index b51e9af..fdca20b 100644 --- a/BroadcastWidgetExample/app/src/main/java/com/erenutku/broadcastwidgetexample/MainActivity.java +++ b/BroadcastWidgetExample/app/src/main/java/com/erenutku/broadcastwidgetexample/MainActivity.java @@ -1,6 +1,6 @@ package com.erenutku.broadcastwidgetexample; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; public class MainActivity extends AppCompatActivity { diff --git a/BroadcastWidgetExample/build.gradle b/BroadcastWidgetExample/build.gradle index 74b2ab0..7d34715 100644 --- a/BroadcastWidgetExample/build.gradle +++ b/BroadcastWidgetExample/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/BroadcastWidgetExample/gradle.properties b/BroadcastWidgetExample/gradle.properties index aac7c9b..9e6fce1 100644 --- a/BroadcastWidgetExample/gradle.properties +++ b/BroadcastWidgetExample/gradle.properties @@ -9,6 +9,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/BroadcastWidgetExample/gradle/wrapper/gradle-wrapper.properties b/BroadcastWidgetExample/gradle/wrapper/gradle-wrapper.properties index 04e285f..14ee819 100644 --- a/BroadcastWidgetExample/gradle/wrapper/gradle-wrapper.properties +++ b/BroadcastWidgetExample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sun Jul 12 09:46:13 IST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/ConfigurableWidgetExample/.idea/caches/build_file_checksums.ser b/ConfigurableWidgetExample/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..d47fad6f327f8737fd5d40eeb485102ee8f16b7f GIT binary patch literal 533 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10S!18}mhbLxkeX0=^7o4WADqX_B zlLYcFOjjX89RnLkVO8;|3+}%s%=U|qV4M2U^+pMUKu&&gVh$*@3Q~(oGE<97;fkke zJ5KjLKKY03>^lMczr=QyFsSHfemK5!@ICT#@a$+0U?vPi>{@u<#yV?L$JX)~9i@`eqbb1!cMx-GGwKp(qDF8}NidcUAKyZ1w2xP^hyr3wJg C`@2*C literal 0 HcmV?d00001 diff --git a/ConfigurableWidgetExample/.idea/codeStyles/Project.xml b/ConfigurableWidgetExample/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/ConfigurableWidgetExample/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/ConfigurableWidgetExample/.idea/gradle.xml b/ConfigurableWidgetExample/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/ConfigurableWidgetExample/.idea/gradle.xml +++ b/ConfigurableWidgetExample/.idea/gradle.xml @@ -1,8 +1,10 @@ + - + \ No newline at end of file diff --git a/ConfigurableWidgetExample/.idea/modules.xml b/ConfigurableWidgetExample/.idea/modules.xml index a783cd2..cece731 100644 --- a/ConfigurableWidgetExample/.idea/modules.xml +++ b/ConfigurableWidgetExample/.idea/modules.xml @@ -3,6 +3,8 @@ + + diff --git a/ConfigurableWidgetExample/app/build.gradle b/ConfigurableWidgetExample/app/build.gradle index c8f10e2..2a683be 100644 --- a/ConfigurableWidgetExample/app/build.gradle +++ b/ConfigurableWidgetExample/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.0" + compileSdkVersion 30 defaultConfig { applicationId "com.erenutku.configurablewidgetexample" minSdkVersion 17 - targetSdkVersion 24 + targetSdkVersion 30 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -20,10 +19,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' - testCompile 'junit:junit:4.12' + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' } diff --git a/ConfigurableWidgetExample/app/src/androidTest/java/com/erenutku/configurablewidgetexample/ExampleInstrumentedTest.java b/ConfigurableWidgetExample/app/src/androidTest/java/com/erenutku/configurablewidgetexample/ExampleInstrumentedTest.java index 7270129..6536dee 100644 --- a/ConfigurableWidgetExample/app/src/androidTest/java/com/erenutku/configurablewidgetexample/ExampleInstrumentedTest.java +++ b/ConfigurableWidgetExample/app/src/androidTest/java/com/erenutku/configurablewidgetexample/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.erenutku.configurablewidgetexample; 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; diff --git a/ConfigurableWidgetExample/app/src/main/java/com/erenutku/configurablewidgetexample/MainActivity.java b/ConfigurableWidgetExample/app/src/main/java/com/erenutku/configurablewidgetexample/MainActivity.java index c91c43a..099bb7e 100644 --- a/ConfigurableWidgetExample/app/src/main/java/com/erenutku/configurablewidgetexample/MainActivity.java +++ b/ConfigurableWidgetExample/app/src/main/java/com/erenutku/configurablewidgetexample/MainActivity.java @@ -1,6 +1,6 @@ package com.erenutku.configurablewidgetexample; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; public class MainActivity extends AppCompatActivity { diff --git a/ConfigurableWidgetExample/build.gradle b/ConfigurableWidgetExample/build.gradle index c20bca1..7d34715 100644 --- a/ConfigurableWidgetExample/build.gradle +++ b/ConfigurableWidgetExample/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/ConfigurableWidgetExample/gradle.properties b/ConfigurableWidgetExample/gradle.properties index aac7c9b..9e6fce1 100644 --- a/ConfigurableWidgetExample/gradle.properties +++ b/ConfigurableWidgetExample/gradle.properties @@ -9,6 +9,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/ConfigurableWidgetExample/gradle/wrapper/gradle-wrapper.properties b/ConfigurableWidgetExample/gradle/wrapper/gradle-wrapper.properties index 04e285f..754376e 100644 --- a/ConfigurableWidgetExample/gradle/wrapper/gradle-wrapper.properties +++ b/ConfigurableWidgetExample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sun Jul 12 09:50:52 IST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/SimpleWidgetExample/.idea/caches/build_file_checksums.ser b/SimpleWidgetExample/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..b7ac9a7c764caaa3614c874be5f2b06149affd6c GIT binary patch literal 533 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}mUAUQpdoSsKwaRyMH zmHpPi!(s^+nHiYe7`Srs6I0w0lS}f8JQ+AkGKx}*GxBp%Dhli!7(jrhoC8P-05KcT zqTnf0c10S!18}mhbLxkeX0=^7o4WADqX_B zlLYcFOjjX89RnLkVO8;|3+}%s%=U|qV4M2U^+pMUKu&&gVh$*@3Q~(oGE<97;fkfZ zF7$4?=lyNVJ^?S2owv$L7*zB#@^e%5(}C{QhnlUA2yP4muE_S>>}S}-^0I+*#+x5b zbtMdfcvR=UF`v@qw3$m$dBXHa(Fc)3#nqhF#qVubGd<6h* C-@3j4 literal 0 HcmV?d00001 diff --git a/SimpleWidgetExample/.idea/codeStyles/Project.xml b/SimpleWidgetExample/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/SimpleWidgetExample/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/SimpleWidgetExample/.idea/gradle.xml b/SimpleWidgetExample/.idea/gradle.xml index 7ac24c7..5cd135a 100644 --- a/SimpleWidgetExample/.idea/gradle.xml +++ b/SimpleWidgetExample/.idea/gradle.xml @@ -1,8 +1,10 @@ +