Skip to content

Commit 54cf128

Browse files
committed
refactor: share code between kotlin and android
1 parent 7b6cd0a commit 54cf128

File tree

14 files changed

+53
-192
lines changed

14 files changed

+53
-192
lines changed

src/SDK/Language/Android.php

+28-8
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,42 @@ public function getFiles(): array
108108
[
109109
'scope' => 'default',
110110
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Permission.kt',
111-
'template' => '/android/library/src/main/java/io/appwrite/Permission.kt.twig',
111+
'template' => '/kotlin/src/main/kotlin/io/appwrite/Permission.kt.twig',
112+
],
113+
[
114+
'scope' => 'default',
115+
'destination' => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/PermissionTest.kt',
116+
'template' => '/kotlin/src/test/kotlin/io/appwrite/PermissionTest.kt.twig',
112117
],
113118
[
114119
'scope' => 'default',
115120
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Role.kt',
116-
'template' => '/android/library/src/main/java/io/appwrite/Role.kt.twig',
121+
'template' => '/kotlin/src/main/kotlin/io/appwrite/Role.kt.twig',
122+
],
123+
[
124+
'scope' => 'default',
125+
'destination' => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/RoleTest.kt',
126+
'template' => '/kotlin/src/test/kotlin/io/appwrite/RoleTest.kt.twig',
117127
],
118128
[
119129
'scope' => 'default',
120130
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/ID.kt',
121-
'template' => '/android/library/src/main/java/io/appwrite/ID.kt.twig',
131+
'template' => '/kotlin/src/main/kotlin/io/appwrite/ID.kt.twig',
132+
],
133+
[
134+
'scope' => 'default',
135+
'destination' => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/IDTest.kt',
136+
'template' => '/kotlin/src/test/kotlin/io/appwrite/IDTest.kt.twig',
122137
],
123138
[
124139
'scope' => 'default',
125140
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Query.kt',
126-
'template' => '/android/library/src/main/java/io/appwrite/Query.kt.twig',
141+
'template' => '/kotlin/src/main/kotlin/io/appwrite/Query.kt.twig',
142+
],
143+
[
144+
'scope' => 'default',
145+
'destination' => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/QueryTest.kt',
146+
'template' => '/kotlin/src/test/kotlin/io/appwrite/QueryTest.kt.twig',
127147
],
128148
[
129149
'scope' => 'default',
@@ -178,7 +198,7 @@ public function getFiles(): array
178198
[
179199
'scope' => 'default',
180200
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/Response.kt',
181-
'template' => '/android/library/src/main/java/io/appwrite/Response.kt.twig',
201+
'template' => '/kotlin/src/main/kotlin/io/appwrite/Response.kt.twig',
182202
],
183203
[
184204
'scope' => 'default',
@@ -238,7 +258,7 @@ public function getFiles(): array
238258
[
239259
'scope' => 'default',
240260
'destination' => '/library/src/test/java/{{ sdk.namespace | caseSlash }}/cookies/CookiesTest.kt',
241-
'template' => '/android/library/src/test/java/io/appwrite/cookies/CookiesTest.kt.twig',
261+
'template' => '/kotlin/src/test/kotlin/io/appwrite/cookies/CookiesTest.kt.twig',
242262
],
243263
[
244264
'scope' => 'default',
@@ -400,12 +420,12 @@ public function getFiles(): array
400420
[
401421
'scope' => 'definition',
402422
'destination' => 'library/src/main/java/io/appwrite/models/{{ definition.name | caseUcfirst }}.kt',
403-
'template' => '/android/library/src/main/java/io/appwrite/models/Model.kt.twig',
423+
'template' => '/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig',
404424
],
405425
[
406426
'scope' => 'definition',
407427
'destination' => 'library/src/test/java/io/appwrite/models/{{ definition.name | caseUcfirst }}Test.kt',
408-
'template' => '/android/library/src/test/java/io/appwrite/models/ModelTest.kt.twig',
428+
'template' => '/kotlin/src/test/kotlin/io/appwrite/models/ModelTest.kt.twig',
409429
],
410430
];
411431
}

templates/android/library/src/main/java/io/appwrite/ID.kt.twig

-10
This file was deleted.

templates/android/library/src/main/java/io/appwrite/Permission.kt.twig

-21
This file was deleted.

templates/android/library/src/main/java/io/appwrite/Query.kt.twig

-60
This file was deleted.

templates/android/library/src/main/java/io/appwrite/Role.kt.twig

-72
This file was deleted.

templates/android/library/src/test/java/io/appwrite/services/ServiceTest.kt.twig

-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ import org.junit.Test
1616
import org.junit.runner.RunWith
1717
import kotlin.test.assertIs
1818

19-
{%~ if method.type == 'webAuth' ~%}
2019
@RunWith(AndroidJUnit4::class)
21-
{%~ endif ~%}
2220
class {{service.name | caseUcfirst}}ServiceTest {
2321
private lateinit var client: Client
2422
private lateinit var {{service.name | caseCamel}}: {{service.name | caseUcfirst}}

0 commit comments

Comments
 (0)