Merge branch 'master' of github.com:tommus/ktx-account

tommus · Mar 15, 2020 · dc48972 · dc48972
2 parents 3112703 + 8fc2dc0
commit dc48972
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ktx-account-compiler/src/main/resources/co/windly/ktxaccount/compiler/scheme.ftl b/ktx-account-compiler/src/main/resources/co/windly/ktxaccount/compiler/scheme.ftl
@@ -8,8 +8,8 @@ import co.windly.ktxaccount.runtime.scheme.MultipleAccountScheme
 import co.windly.ktxaccount.runtime.scheme.SingleAccountScheme
 </#if>
 <#list descriptorList as descriptor>
-import ${package}.AccountDefinitionConstants.Companion.DEFAULT_${descriptor.fieldNameUpperCase}
-import ${package}.AccountDefinitionConstants.Companion.KEY_${descriptor.fieldNameUpperCase}
+import ${package}.${constantsClassName}.Companion.DEFAULT_${descriptor.fieldNameUpperCase}
+import ${package}.${constantsClassName}.Companion.KEY_${descriptor.fieldNameUpperCase}
 </#list>
 import io.reactivex.BackpressureStrategy.LATEST
 import io.reactivex.Completable

diff --git a/...gger/utility/account/AccountDefinition.kt → ...mple/kotlindagger/utility/account/User.kt b/...gger/utility/account/AccountDefinition.kt → ...mple/kotlindagger/utility/account/User.kt
@@ -10,7 +10,7 @@ import co.windly.ktxaccount.annotation.DefaultLong
 import co.windly.ktxaccount.annotation.DefaultString
 
 @AccountScheme(mode = Mode.SINGLE)
-class AccountDefinition(
+class User(
 
   //region Id
 

diff --git a/...in/java/co/windly/ktxaccount/sample/kotlindagger/utility/manager/AccountUtilityManager.kt b/...in/java/co/windly/ktxaccount/sample/kotlindagger/utility/manager/AccountUtilityManager.kt
@@ -1,7 +1,7 @@
 package co.windly.ktxaccount.sample.kotlindagger.utility.manager
 
 import android.content.Context
-import co.windly.ktxaccount.sample.kotlindagger.utility.account.AccountDefinitionScheme
+import co.windly.ktxaccount.sample.kotlindagger.utility.account.UserScheme
 import io.reactivex.annotations.SchedulerSupport
 import io.reactivex.annotations.SchedulerSupport.IO
 import javax.inject.Inject
@@ -10,7 +10,7 @@ import javax.inject.Singleton
 @Singleton
 @SchedulerSupport(value = IO)
 class AccountUtilityManager @Inject constructor(context: Context) :
-  AccountDefinitionScheme(context) {
+  UserScheme(context) {
 
   //region Authenticator
 

diff --git a/versions.gradle b/versions.gradle
@@ -51,7 +51,7 @@ deps.build = build
 
 def build_versions = [:]
 build_versions.compile_sdk = 29
-build_versions.min_sdk = 22
+build_versions.min_sdk = 16
 build_versions.target_sdk = 29
 deps.build_versions = build_versions