add ci

remove rx
add livedata

Author: kuamanet

.github/workflows/code-style.yml

@@ -0,0 +1,50 @@
+on:
+    push:
+        branches:
+            - master
+            - develop
+    pull_request:
+
+name: Code Style
+
+jobs:
+    spotless-check:
+        name: Spotless Style Check
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+
+            - uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+
+            - run: ./gradlew spotlessCheck
+
+
+    lint:
+        name: Android Lint
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+
+            - uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+
+            - run: ./gradlew lint

.github/workflows/tests.yml

@@ -0,0 +1,30 @@
+on:
+    push:
+        branches:
+            - master
+            - develop
+    pull_request:
+
+name: Tests
+
+jobs:
+    gradle-test:
+        name: Gradle Test
+        runs-on: ubuntu-latest
+        timeout-minutes: 15
+
+        steps:
+            - uses: actions/checkout@v2
+
+            - uses: actions/setup-java@v1
+              with:
+                  java-version: 1.8
+
+            - uses: actions/cache@v1
+              with:
+                  path: ~/.gradle/caches
+                  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+                  restore-keys: |
+                      ${{ runner.os }}-gradle-
+
+            - run: ./gradlew :cleanTest :test

CHANGELOG.md

@@ -0,0 +1,6 @@
+## Unreleased
+
+# Version 1.1.0
+> 2021-06-09
+- Expose `WifiLiveData`
+- Remove RxJava dependency

README.md

@@ -1,34 +1,50 @@
 # WiFiMonitor
+[![](https://jitpack.io/v/Kuama-IT/android-kotlin-wifi-watcher.svg)](https://jitpack.io/#Kuama-IT/android-kotlin-wifi-watcher)
+
 Allows you to watch for wi-fi changes on an Android device.
 
 ```kotlin
-val monitor = WifiMonitor.Builder().context(aContext).build()
-
-subscribe = monitor.info.subscribe {
-    println("${it.state.name} - ${it.ssid} - ${it.bssid} - ${it.rssi}")
+class WiFiViewModel(context: Context) : ViewModel() {
+    val values = WifiLiveData(WifiMonitor(context))
 }
 
-```
-don't forget to unsubscribe when you don't need it anymore
-```kotlin
-override fun onPause() {
-    super.onPause()
-    if (subscribe?.isDisposed == false) {
-        subscribe?.dispose()
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val viewModel = WiFiViewModel(this)
+
+        viewModel.values.observe(this) {
+            println(it.band)
+            println(it.bssid)
+            println(it.state.name)
+        }
     }
 }
+
 ```
 
 ### Do I need a context?
-Sadly yes, to bootstrap the library you will need a valid context:
+Sadly yes, to bootstrap the library you will need a valid context.
 
-```kotlin
-WifiMonitor.Builder().context(this).build() // this is a context (eg. activity)
+### Installation
+Add the JitPack repository to your build file
 ```
+allprojects {
+    repositories {
+        ...
+        maven { url 'https://jitpack.io' }
+    }
+}
+```
+Add the dependency
 
-### Can I subscribe multiple times?
-Yes, the `info` object is a `ConnectableObservable`
-
+```
+dependencies {
+    implementation 'com.github.Kuama-IT:android-kotlin-wifi-watcher:Tag'
+}
+```
 ### Which states could I get?
 
 #### `CONNECTED`

build.gradle

@@ -1,68 +1,75 @@
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = "1.5.10"
     repositories {
         google()
-        jcenter()
-    }
+        mavenCentral()
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath "com.android.tools.build:gradle:4.2.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:4.4.0"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:5.12.5"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://jitpack.io' }
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+    }
+    }
+
+    ext {
+        artifactId = 'wifi-watcher'
+        groupId = 'net.kuama.android'
+        compile_sdk_version = 30
+        min_sdk_version = 21
+        target_sdk_version = 30
+        version_code = project.property("version_code").toInteger()
+        version_name = project.property("version_name") as String
     }
 }
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
 apply plugin: "maven-publish"
-apply plugin: "com.diffplug.gradle.spotless"
+apply plugin: "com.diffplug.spotless"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode project.property('version_code').toInteger()
-        versionName project.property('version_name') as String
+        minSdkVersion rootProject.ext.min_sdk_version
+        targetSdkVersion rootProject.ext.target_sdk_version
+        versionCode rootProject.ext.version_code
+        versionName rootProject.ext.version_name
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
+        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
 
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.19"
-    implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
-    implementation 'com.github.jitpack:gradle-simple:1.0'
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
+
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "io.mockk:mockk:1.11.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }
 
 
@@ -81,19 +88,26 @@ task sourceJar(type: Jar) {
     classifier "sources"
 }
 
-publishing {
-    publications {
-        bar(MavenPublication) {
-            groupId 'net.kuama.android'
-            artifactId 'wifi-monitor'
-            version project.property('version_name')
-            artifact(sourceJar)
-            artifact("$buildDir/outputs/aar/wifi-monitor-release.aar")
-        }
-    }
-    repositories {
-        maven {
-            url "$buildDir/repo"
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                // Adds javadocs and sources as separate jars.
+                // artifact androidJavadocsJar
+                artifact androidSourcesJar
+
+                groupId rootProject.ext.groupId
+                artifactId rootProject.ext.artifactId
+                version project.property("version_name") as String
+
+            }
         }
     }
 }

gradle.properties

@@ -1,23 +1,6 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# 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
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-version_code=6
-version_name=1.0
+version_code=7
+version_name=1.1.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Wed Jun 09 08:08:14 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

publish.gradle

@@ -1,6 +1,6 @@
 package net.kuama.wifiMonitor
 
-internal interface WifiListener {
+interface WifiListener {
     fun stop()
 
     fun start(onChange: () -> Unit)