Skip to content

Commit 277af87

Browse files
Merge pull request #1886 from electrode-io/revert-1885-api-impl-gen-androidx
2 parents 37604cb + 389da8f commit 277af87

File tree

8 files changed

+8
-10
lines changed

8 files changed

+8
-10
lines changed

ern-api-impl-gen/resources/android/RequestHandlerProvider.java.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.ern.api.impl;
44

5-
import androidx.annotation.Nullable;
5+
import android.support.annotation.Nullable;
66

77
{{>generatedCode}}
88

ern-api-impl-gen/resources/android/apiController.mustache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
package com.ern.api.impl;
44

5+
import android.support.annotation.Nullable;
56
import android.util.Log;
67

7-
import androidx.annotation.Nullable;
8-
98
{{>generatedCode}}
109

1110
public final class {{apiName}}ApiController {

ern-api-impl-gen/resources/android/requestHandlerProvider.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.ern.api.impl;
44

5-
import androidx.annotation.Nullable;
5+
import android.support.annotation.Nullable;
66

77
/**
88
* A generated placeholder for your {{apiName}} implementation.

system-tests/fixtures/api-impl-native/ern-movie-api-impl/android/lib/src/main/java/com/ern/api/impl/MoviesApiController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616

1717
package com.ern.api.impl;
1818

19+
import android.support.annotation.Nullable;
1920
import android.util.Log;
2021

21-
import androidx.annotation.Nullable;
22-
2322
//
2423
// GENERATED CODE: DO NOT MODIFY
2524
//

system-tests/fixtures/api-impl-native/ern-movie-api-impl/android/lib/src/main/java/com/ern/api/impl/MoviesApiRequestHandlerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.ern.api.impl;
1818

19-
import androidx.annotation.Nullable;
19+
import android.support.annotation.Nullable;
2020

2121
/**
2222
* A generated placeholder for your Movies implementation.

system-tests/fixtures/api-impl-native/ern-movie-api-impl/android/lib/src/main/java/com/ern/api/impl/RequestHandlerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.ern.api.impl;
1818

19-
import androidx.annotation.Nullable;
19+
import android.support.annotation.Nullable;
2020

2121
//
2222
// GENERATED CODE: DO NOT MODIFY

system-tests/fixtures/api/complex-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"author": "generated",
1010
"dependencies": {
11-
"react-native-electrode-bridge": "^1.6.0"
11+
"react-native-electrode-bridge": "^1.5.27"
1212
},
1313
"ern": {
1414
"message": {

system-tests/fixtures/api/test-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"author": "generated",
1010
"dependencies": {
11-
"react-native-electrode-bridge": "^1.6.0"
11+
"react-native-electrode-bridge": "^1.5.27"
1212
},
1313
"ern": {
1414
"message": {

0 commit comments

Comments
 (0)