Upgraded Kotlin / Gradle / AndroidX

.gitignore

@@ -2,8 +2,14 @@ gen/
 .gradle
 .idea
 .settings
+build/
 build
 .project
 .classpath
 local.properties
 *.iml
+AndroidBroadcastsMonitor/build
+AndroidBroadcastsMonitor/debug
+AndroidBroadcastsMonitor/release
+
+

AndroidBroadcastsMonitor/.gitignore

@@ -0,0 +1,4 @@
+build
+debug
+release
+*.iml

AndroidBroadcastsMonitor/build.gradle

@@ -0,0 +1,46 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+//apply plugin: 'kotlin-android-extensions'
+
+
+android {
+    signingConfigs {
+        sign {
+            storeFile file('C:\\Users\\mario\\OneDrive\\Documents\\Android\\Keystore\\keystore.jks')
+            storePassword '221506217'
+            keyAlias 'mariodantas'
+            keyPassword '221506217'
+        }
+    }
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
+    defaultConfig {
+        applicationId "lt.andro.broadcastlogger"
+        minSdkVersion 27
+        targetSdkVersion 29
+        versionCode 5
+        versionName "1.5.20180318"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        signingConfig signingConfigs.sign
+    }
+    buildTypes {
+        release {
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.sign
+        }
+    }
+    ndkVersion '22.0.7026061'
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+    implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.4.32'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+}

app/src/androidTest/java/lt/andro/broadcastlogger/ExampleInstrumentedTest.kt → AndroidBroadcastsMonitor/src/androidTest/java/lt/andro/broadcastlogger/ExampleInstrumentedTest.kt

@@ -1,7 +1,7 @@
 package lt.andro.broadcastlogger
 
-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

app/src/main/java/lt/andro/broadcastlogger/BroadcastMonitoringService.java → AndroidBroadcastsMonitor/src/main/java/lt/andro/broadcastlogger/BroadcastMonitoringService.java

@@ -8,7 +8,7 @@
 import android.content.IntentFilter;
 import android.content.IntentFilter.MalformedMimeTypeException;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
 import java.util.Arrays;

app/src/main/java/lt/andro/broadcastlogger/MainActivity.java → AndroidBroadcastsMonitor/src/main/java/lt/andro/broadcastlogger/MainActivity.java

@@ -3,13 +3,13 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.SimpleCursorAdapter;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/res/layout/toolbar.xml → AndroidBroadcastsMonitor/src/main/res/layout/toolbar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"

build.gradle

@@ -1,27 +1,36 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+
+
 allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        gradlePluginPortal()
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
+    delete file('AndroidBroadcastsMonitor/debug')
+    delete file('AndroidBroadcastsMonitor/release')
+
 }

gradle.properties

@@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+# android.overridePathCheck=true
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 11 11:16:06 EET 2018
+#Sun Apr 11 21:45:50 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':AndroidBroadcastsMonitor'