bump deps versions, change path name

Author: luca

.gitignore

@@ -19,5 +19,5 @@ local.properties
 .DS_Store
 
 .externalNativeBuild
-/lib/src/main/res/xml/credentials.xml
+/auth/src/main/res/xml/credentials.xml
 /sampleapp/src/main/res/xml/credentials.xml

.idea/gradle.xml

@@ -0,0 +1,91 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+apply plugin: 'com.github.dcendents.android-maven'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion = '28.0.3'
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode = 1
+        versionName = VERSION_NAME
+    }
+
+    sourceSets {
+        test.java.srcDirs += 'src/test/kotlin'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+        noReflect = true
+    }
+}
+
+androidExtensions {
+    experimental = true
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    testImplementation "junit:junit:$junit_ver"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockito_ver"
+    testImplementation "xyz.nulldev.huandroid:huandroid:$htmlunit_ver"
+
+
+    implementation "androidx.core:core-ktx:$ktx_ver"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_ver"
+
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_ver"
+    implementation "com.squareup.retrofit2:converter-moshi:$retrofit_ver"
+
+    implementation "com.squareup.moshi:moshi:$moshi_ver"
+    kapt           "com.squareup.moshi:moshi-kotlin-codegen:$moshi_ver"
+}
+
+install {
+    repositories.mavenInstaller {
+
+        pom.project {
+
+            packaging 'aar'
+            groupId GROUP_ID
+            artifactId ARTIFACT_ID
+            version VERSION_NAME
+
+            name NAME
+            description = DESCRIPTION
+            url REPO_URL
+
+            licenses {
+                license {
+                    name 'MIT License'
+                    url 'http://www.opensource.org/licenses/mit-license.php'
+                }
+            }
+            developers {
+                developer {
+                    id 'KirkBushman'
+                    name 'Luca Pellizzari'
+                    email '[email protected]'
+                }
+            }
+            scm {
+                connection GIT_URL
+                developerConnection GIT_URL
+                url REPO_URL
+            }
+        }
+    }
+}

lib/.gitignore renamed to auth/.gitignore

@@ -62,6 +62,10 @@ class TokenBearer(
         return "Authorization: bearer ${getRawAccessToken()}"
     }
 
+    fun getAuthHeader(): Map<String, String> {
+        return hashMapOf("Authorization" to "bearer ".plus(getRawAccessToken()))
+    }
+
     fun revokeToken() {
 
         if (isRevoked) {

auth/build.gradle

@@ -3,17 +3,19 @@
 buildscript {
 
     ext {
-        android_gradle_ver  = '3.4.0'
+        android_gradle_ver  = '3.4.1'
 
-        kotlin_ver          = '1.3.31'
-        ktx_ver             = '1.0.2'
-        mdc_ver             = '1.1.0-alpha06'
-        retrofit_ver        = '2.5.0'
-        moshi_ver           = '1.8.0'
+        kotlin_ver      = '1.3.31'
+        ktx_ver         = '1.0.2'
+        mdc_ver         = '1.1.0-alpha07'
+        retrofit_ver    = '2.6.0'
+        moshi_ver       = '1.8.0'
 
-        junit_ver           = '4.12'
-        mockito_ver         = '2.1.0'
-        htmlunit_ver        = '2.30.01'
+        junit_ver       = '4.12'
+        mockito_ver     = '2.1.0'
+        htmlunit_ver    = '2.30.01'
+
+        maven_plugin    = '2.1'
     }
 
     repositories {
@@ -25,8 +27,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:$android_gradle_ver"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_ver"
 
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_plugin"
     }
 }
 

lib/proguard-rules.pro renamed to auth/proguard-rules.pro

@@ -1,12 +1,14 @@
 
 NAME='com.kirkbushman:android-reddit-oauth2'
+PLAIN_NAME='android-reddit-oauth2'
 DESCRIPTION='This library helps authenticate Reddit API and manage token, while making requests.'
-VERSION_NAME=1.0.0
+VERSION_NAME=1.0.1
 GROUP=com.kirkbushman.android_reddit_oauth2
 GROUP_ID=com.kirkbushman
 ARTIFACT_ID=android-reddit-oauth2
 REPO_URL='https://github.com/KirkBushman/Android-Reddit-OAuth2'
 GIT_URL='https://github.com/KirkBushman/Android-Reddit-OAuth2.git'
+ISSUES_URL='https://github.com/KirkBushman/Android-Reddit-OAuth2/issues'
 
 org.gradle.jvmargs=-Xmx2G
 

lib/src/androidTest/java/com/kirkbushman/lib/Credentials.kt renamed to auth/src/androidTest/java/com/kirkbushman/lib/Credentials.kt

@@ -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-5.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

lib/src/androidTest/java/com/kirkbushman/lib/UrlResponseTest.kt renamed to auth/src/androidTest/java/com/kirkbushman/lib/UrlResponseTest.kt

@@ -7,15 +7,15 @@ configurations {
 }
 
 dependencies {
-    ktlint "com.github.shyiko:ktlint:0.31.0"
+    ktlint "com.pinterest:ktlint:0.33.0"
     // additional 3rd party ruleset(s) can be specified here
     // just add them to the classpath (ktlint 'groupId:artifactId:version') and
     // ktlint will pick them up
 }
 
 task ktlint(type: JavaExec, group: "verification") {
     description = "Check Kotlin code style."
-    main = "com.github.shyiko.ktlint.Main"
+    main = "com.pinterest.ktlint.Main"
     classpath = configurations.ktlint
     args "src/**/*.kt"
     // to generate report in checkstyle format prepend following args:

lib/src/main/AndroidManifest.xml renamed to auth/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_ver"
 
-    implementation project(":lib")
+    implementation project(':auth')
 
     implementation "com.google.android.material:material:$mdc_ver"
     implementation "androidx.core:core-ktx:$ktx_ver"

lib/src/main/java/com/kirkbushman/lib/errors/AccessDeniedException.kt renamed to auth/src/main/java/com/kirkbushman/lib/errors/AccessDeniedException.kt

@@ -1 +1 @@
-include ':lib', ':sampleapp'
+include ':auth', ':sampleapp'