Skip to content

Commit 805c569

Browse files
committed
fixing bug
1 parent 291d6bc commit 805c569

20 files changed

+22
-119
lines changed

.idea/codeStyles/Project.xml

-35
This file was deleted.

.idea/codeStyles/codeStyleConfig.xml

-5
This file was deleted.

.idea/compiler.xml

-8
This file was deleted.

.idea/gradle.xml

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

-38
This file was deleted.

.idea/runConfigurations.xml

-12
This file was deleted.

.idea/vcs.xml

-6
This file was deleted.

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android {
2727
dependencies {
2828

2929
//implementation 'com.github.devmike01.JadeSharedPreference:jadesharedpreference-annotations:0.2.5'
30-
kapt project(':jadesharedpreference-compiler')
31-
implementation project(':jadesharedpreference-annotations')
30+
kapt project(':compiler')
31+
implementation project(':binder')
3232

3333
//implementation project(":annotations")
3434
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
File renamed without changes.

jadesharedpreference-annotations/build.gradle binder/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ apply plugin: 'kotlin-android-extensions'
66

77
apply plugin: 'kotlin-kapt'
88

9+
10+
apply plugin: 'com.github.dcendents.android-maven'
11+
912
//group='com.github.devmike01.jadesharedpreference'
1013

1114
//groupId: 'com.github.devmike01.Jadesharedpreference'

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
dependencies {
1010

11-
//classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // Add this line
1212
classpath 'com.android.tools.build:gradle:3.2.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

File renamed without changes.

jadesharedpreference-compiler/build.gradle compiler/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apply plugin: 'kotlin'
22
apply plugin: 'kotlin-kapt'
33
apply plugin: 'kotlin-android-extensions'
44

5-
6-
//apply plugin: 'com.github.dcendents.android-maven'
5+
apply plugin: 'com.github.dcendents.android-maven'
76

87
//group='com.github.devmike01.Jadesharedpreference'
98

jadesharedpreference-compiler/src/main/java/devmike/jade/com/processor/AnnotationProcessor.kt compiler/src/main/java/devmike/jade/com/compiler/AnnotationProcessor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package devmike.jade.com.processor
1+
package devmike.jade.com.compiler
22

33
import com.google.auto.service.AutoService
44
import devmike.jade.com.annotations.SharedPref
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package devmike.jade.com.compiler;
2+
3+
public class MyClass {
4+
}

jadesharedpreference-compiler/src/main/java/devmike/jade/com/processor/ProcessorHelper.kt compiler/src/main/java/devmike/jade/com/compiler/ProcessorHelper.kt

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package devmike.jade.com.processor
1+
package devmike.jade.com.compiler
22

33
import com.squareup.kotlinpoet.*
4-
import devmike.jade.com.annotations.read.*
54
import devmike.jade.com.annotations.SharedPref
5+
import devmike.jade.com.annotations.read.*
6+
import devmike.jade.com.processor.NameStore
67
import java.io.File
78
import java.util.HashSet
89
import javax.annotation.processing.ProcessingEnvironment
@@ -136,7 +137,8 @@ internal object ProcessorHelper {
136137
.addModifiers(KModifier.PRIVATE)
137138
//Generate the statement that saved value into the SharedPreference
138139
for (annotatedParam in ElementFilter.fieldsIn(typeElement.enclosedElements)) {
139-
val annotatedList = listOf(ReadString::class.simpleName,
140+
val annotatedList = listOf(
141+
ReadString::class.simpleName,
140142
ReadLong::class.simpleName, ReadStringSet::class.simpleName,
141143
ReadFloat::class.simpleName,
142144
ReadInt::class.simpleName)
@@ -165,8 +167,8 @@ internal object ProcessorHelper {
165167

166168
private fun pickAnnotation(buildReadSharedPrefValueBuilder:
167169
FunSpec.Builder,
168-
annotatedList: List<String?>, annotatedParam: Element,
169-
className: ClassName) {
170+
annotatedList: List<String?>, annotatedParam: Element,
171+
className: ClassName) {
170172

171173
/* "(%L as %L).%L = %L.get%L(%S, %S)",
172174
NameStore.Variable.CLASS_VAR,

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':annotations', ':jadesharedpreference-compiler', ':processor', ':jadesharedpreference-annotations'
1+
include ':app', ':annotations', ':binder', ':compiler'

0 commit comments

Comments
 (0)