Skip to content

Commit aeca989

Browse files
andriydrukandriydruk
authored
Merge branch 'master' into master
2 parents e1f05c9 + 4e8c0f4 commit aeca989

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

‎build.gradle

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

1111
dependencies {
12-
classpath "com.android.tools.build:gradle:3.5.1"
12+
classpath "com.android.tools.build:gradle:3.6.0"
1313
classpath "com.readdle.android.swift:gradle:1.3.2"
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"

‎compiler/src/main/java/com/readdle/codegen/JavaSwiftProcessor.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
5757
filer = processingEnv.getFiler();
5858
messager = processingEnv.getMessager();
5959

60-
messager.printMessage(Diagnostic.Kind.NOTE, "JavaSwiftProcessor init started");
60+
messager.printMessage(Diagnostic.Kind.WARNING, "JavaSwiftProcessor init started");
6161

6262
String packageJson = processingEnv.getOptions().get(PACKAGE_OPTION);
6363

@@ -67,21 +67,21 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
6767
return;
6868
}
6969

70-
messager.printMessage(Diagnostic.Kind.NOTE, "Package moduleName: " + moduleDescriptor.moduleName);
70+
messager.printMessage(Diagnostic.Kind.WARNING, "Package moduleName: " + moduleDescriptor.moduleName);
7171

7272
if (moduleDescriptor.importPackages != null) {
7373
for (String anImport : moduleDescriptor.importPackages) {
74-
messager.printMessage(Diagnostic.Kind.NOTE, "Package import: " + anImport);
74+
messager.printMessage(Diagnostic.Kind.WARNING, "Package import: " + anImport);
7575
}
7676
}
7777

7878
if (moduleDescriptor.customTypeMappings != null) {
7979
for (String key : moduleDescriptor.customTypeMappings.keySet()) {
80-
messager.printMessage(Diagnostic.Kind.NOTE, "Package custom mapping: " + key + " -> " + moduleDescriptor.customTypeMappings.get(key));
80+
messager.printMessage(Diagnostic.Kind.WARNING, "Package custom mapping: " + key + " -> " + moduleDescriptor.customTypeMappings.get(key));
8181
}
8282
}
8383

84-
messager.printMessage(Diagnostic.Kind.NOTE, "JavaSwiftProcessor init finished successfully");
84+
messager.printMessage(Diagnostic.Kind.WARNING, "JavaSwiftProcessor init finished successfully");
8585
}
8686

8787
@Override
@@ -120,7 +120,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
120120

121121
private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
122122
Filer filer = processingEnv.getFiler();
123-
messager.printMessage(Diagnostic.Kind.NOTE, "JavaSwiftProcessor start code generation");
123+
messager.printMessage(Diagnostic.Kind.WARNING, "JavaSwiftProcessor start code generation");
124124

125125
try {
126126
generateJavaSwift(filer);
@@ -129,13 +129,13 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
129129
error(null, "Can't write to file: " + e.getMessage());
130130
}
131131

132-
messager.printMessage(Diagnostic.Kind.NOTE, "SwiftValue to process: "
132+
messager.printMessage(Diagnostic.Kind.WARNING, "SwiftValue to process: "
133133
+ roundEnv.getElementsAnnotatedWith(SwiftValue.class).size());
134-
messager.printMessage(Diagnostic.Kind.NOTE, "SwiftReference to process: "
134+
messager.printMessage(Diagnostic.Kind.WARNING, "SwiftReference to process: "
135135
+ roundEnv.getElementsAnnotatedWith(SwiftReference.class).size());
136-
messager.printMessage(Diagnostic.Kind.NOTE, "SwiftDelegate to process: "
136+
messager.printMessage(Diagnostic.Kind.WARNING, "SwiftDelegate to process: "
137137
+ roundEnv.getElementsAnnotatedWith(SwiftDelegate.class).size());
138-
messager.printMessage(Diagnostic.Kind.NOTE, "SwiftBlock to process: "
138+
messager.printMessage(Diagnostic.Kind.WARNING, "SwiftBlock to process: "
139139
+ roundEnv.getElementsAnnotatedWith(SwiftBlock.class).size());
140140

141141
Map<String, SwiftValueDescriptor> swiftValues = new HashMap<>();
@@ -241,7 +241,7 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
241241
try {
242242
File file = valueDescriptor.generateCode();
243243
/* Logging */
244-
messager.printMessage(Diagnostic.Kind.NOTE, "Generate SwiftValue " + file.getName() + ":");
244+
messager.printMessage(Diagnostic.Kind.WARNING, "Generate SwiftValue " + file.getName() + ":");
245245
for (WritableElement function : valueDescriptor.getFunctions()) {
246246
messager.printMessage(Diagnostic.Kind.NOTE, function.toString(valueDescriptor.getJavaFullName()));
247247
}
@@ -257,7 +257,7 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
257257
try {
258258
File file = referenceDescriptor.generateCode();
259259
/* Logging */
260-
messager.printMessage(Diagnostic.Kind.NOTE, "Generate SwiftReference " + file.getName() + ":");
260+
messager.printMessage(Diagnostic.Kind.WARNING, "Generate SwiftReference " + file.getName() + ":");
261261
for (WritableElement function : referenceDescriptor.functions) {
262262
messager.printMessage(Diagnostic.Kind.NOTE, function.toString(referenceDescriptor.getJavaFullName()));
263263
}
@@ -273,7 +273,7 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
273273
try {
274274
File file = delegateDescriptor.generateCode();
275275
/* Logging */
276-
messager.printMessage(Diagnostic.Kind.NOTE, "Generate SwiftDelegate" + file.getName() + ":");
276+
messager.printMessage(Diagnostic.Kind.WARNING, "Generate SwiftDelegate" + file.getName() + ":");
277277
for (WritableElement function : delegateDescriptor.functions) {
278278
messager.printMessage(Diagnostic.Kind.NOTE, function.toString(delegateDescriptor.getJavaFullName()));
279279
}
@@ -289,7 +289,7 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
289289
try {
290290
File file = blockDescriptor.generateCode();
291291
/* Logging */
292-
messager.printMessage(Diagnostic.Kind.NOTE, "Generate SwiftBlock" + file.getName());
292+
messager.printMessage(Diagnostic.Kind.WARNING, "Generate SwiftBlock" + file.getName());
293293
/* Logging */
294294
} catch (IOException e) {
295295
e.printStackTrace();
@@ -298,7 +298,7 @@ private boolean processImpl(Set<? extends TypeElement> annotations, RoundEnviron
298298
}
299299
}
300300

301-
messager.printMessage(Diagnostic.Kind.NOTE, "JavaSwiftProcessor finished successfully!");
301+
messager.printMessage(Diagnostic.Kind.WARNING, "JavaSwiftProcessor finished successfully!");
302302

303303
return false;
304304
}
@@ -307,7 +307,7 @@ private void generateJavaSwift(Filer filer) throws IOException {
307307
String swiftFilePath = filer.getResource(StandardLocation.SOURCE_OUTPUT, FOLDER, "SwiftJava.swift").toUri().getPath();
308308
File swiftExtensionFile = new File(swiftFilePath);
309309
swiftExtensionFile.getParentFile().mkdir();
310-
messager.printMessage(Diagnostic.Kind.NOTE, "JavaSwiftProcessor will generate sources at: " + swiftExtensionFile.getParent());
310+
messager.printMessage(Diagnostic.Kind.WARNING, "JavaSwiftProcessor will generate sources at: " + swiftExtensionFile.getParent());
311311
SwiftWriter swiftWriter = new SwiftWriter(swiftExtensionFile);
312312
swiftWriter.emitImports(new String[0]);
313313
swiftWriter.emitEmptyLine();

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
GROUP=com.readdle.swift.java.codegen
2-
VERSION_NAME=0.8.1
2+
VERSION_NAME=0.8.2
33

44
org.gradle.jvmargs=-Xmx1536m

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Aug 29 12:50:13 EEST 2019
1+
#Wed Feb 26 14:20:40 EET 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

‎sample/build.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ apply plugin: 'com.readdle.android.swift'
44
apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

7+
apply plugin: 'kotlin-kapt'
8+
79
swift {
10+
useKapt true
811
cleanEnabled true
912
debug {
1013
abiFilters("x86_64")
@@ -44,7 +47,7 @@ android {
4447
}
4548

4649
dependencies {
47-
annotationProcessor project(':compiler')
50+
kapt project(':compiler')
4851
implementation project(':library')
4952

5053
implementation 'com.android.support:appcompat-v7:28.0.0'

0 commit comments

Comments
 (0)