Skip to content

Commit 3fb36da

Browse files
Simply007Simply007
authored
Merge pull request #114 from Kentico/kotlin-showcase
Kotlin sample app
2 parents 45c11ec + 8bcdff4 commit 3fb36da

40 files changed

+878
-24
lines changed

‎.idea/assetWizardSettings.xml‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ Monorepo with Java Kontent packages.
44

55
## Packages
66

7-
| Package | Summary | Version |
8-
| :------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
9-
| [Kontent Delivery Java SDK](/kontent-delivery#readme) | The Kentico Kontent Delivery Java SDK is a client library used for retrieving content from [Kentico Kontent](https://kontent.ai) | [![Download](https://api.bintray.com/packages/kentico/kontent-java-packages/kontent-delivery/images/download.svg)](https://bintray.com/kentico/kontent-java-packages/kontent-delivery/_latestVersion) |
10-
| [Kontent Generators](/kontent-delivery-generators#readme) | This tool generates strongly-typed models based on Content Types in a Kentico Kontent project. | [![Download](https://api.bintray.com/packages/kentico/kontent-java-packages/kontent-delivery-generators/images/download.svg)](https://bintray.com/kentico/kontent-java-packages/kontent-delivery-generators/_latestVersion) |
11-
| [Kontent Sample Spring Boot app](/sample-app-spring-boot#readme) | Showcase of the [Spring boot](https://spring.io/projects/spring-boot) application displaying data from Kontent. | [source](/sample-app-spring-boot/README.md) |
12-
| [Kontent Sample Gradle Console app](/test-gradle-console-app#readme) | Simple Java console application showcasing how to load data from Kontent. | [source](/test-gradle-console-app/README.md) |
13-
| [Kontent Sample Android app (Java)](/sample-app-android#readme) | Showcase of the [Android](https://www.android.com/) application written in Java using [RxJava](https://github.com/ReactiveX/RxJava) displaying data from Kontent. | [source](/sample-app-android/README.md) |
7+
| Package | Summary | Version |
8+
| :----------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
9+
| [Kontent Delivery Java SDK](/kontent-delivery#readme) | The Kentico Kontent Delivery Java SDK is a client library used for retrieving content from [Kentico Kontent](https://kontent.ai) | [![Download](https://api.bintray.com/packages/kentico/kontent-java-packages/kontent-delivery/images/download.svg)](https://bintray.com/kentico/kontent-java-packages/kontent-delivery/_latestVersion) |
10+
| [Kontent Generators](/kontent-delivery-generators#readme) | This tool generates strongly-typed models based on Content Types in a Kentico Kontent project. | [![Download](https://api.bintray.com/packages/kentico/kontent-java-packages/kontent-delivery-generators/images/download.svg)](https://bintray.com/kentico/kontent-java-packages/kontent-delivery-generators/_latestVersion) |
11+
| [Kontent Sample Spring Boot app](/sample-app-spring-boot#readme) | Showcase of the [Spring boot](https://spring.io/projects/spring-boot) application displaying data from Kontent. | [source](/sample-app-spring-boot/README.md) |
12+
| [Kontent Sample Gradle Console app](/test-gradle-console-app#readme) | Simple Java console application showcasing how to load data from Kontent. | [source](/test-gradle-console-app/README.md) |
13+
| [Kontent Sample Android app (Java)](/sample-app-android#readme) | Showcase of the [Android](https://www.android.com/) application written in Java using [RxJava](https://github.com/ReactiveX/RxJava) for data fetching from Kontent. | [source](/sample-app-android/README.md) |
14+
| [Kontent Sample Android app (Kotlin)](/sample-app-android-kotlin#readme) | Showcase of the [Android](https://www.android.com/) application written in Kotlin using [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html) for data fetching from Kontent. | [source](/sample-app-android-kotlin/README.md) |
1415

1516
## Development
1617

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
buildscript {
99
repositories {
1010
jcenter()
11+
google()
1112
}
1213
dependencies {
1314
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
15+
classpath 'com.android.tools.build:gradle:4.0.2'
1416
}
1517
}
1618

@@ -61,7 +63,7 @@ allprojects {
6163

6264

6365
subprojects {
64-
version = '4.1.0-beta.1'
66+
version = '4.1.0-beta.2'
6567
ext.repoGroupId = 'com.github.kentico'
6668
group = 'com.github.kentico'
6769
}

‎kontent-delivery/src/main/java/kentico/kontent/delivery/DeliveryClient.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,9 @@ public CompletionStage put(String url, JsonNode jsonNode, List<ContentItem> cont
109109
static final ScheduledExecutorService SCHEDULER = new ScheduledThreadPoolExecutor(0);
110110

111111
/**
112-
* @param deliveryOptions
113-
* @apiNote Please use this constructor when you need to initialize client with default template configuration - so when you are using template engine. For i.e. Android platform use {@link DeliveryClient#DeliveryClient(DeliveryOptions, TemplateEngineConfig) and set second parameter to null.}
112+
* Please use this constructor when you need to initialize client with default template configuration - so when you are using template engine. For i.e. Android platform use {@link DeliveryClient#DeliveryClient(DeliveryOptions, TemplateEngineConfig)} and set second parameter to null.
113+
*
114+
* @param deliveryOptions delivery options {@link DeliveryOptions}
114115
*/
115116
@SuppressWarnings("WeakerAccess")
116117
public DeliveryClient(DeliveryOptions deliveryOptions) {
@@ -357,9 +358,10 @@ public void registerInlineContentItemsResolver(InlineContentItemsResolver resolv
357358
}
358359

359360
/**
360-
* @param basePackage name of the base package
361-
* @apiNote Not working on Android platform because of JVM and Dalvik differences, please use {@link DeliveryClient#registerType(Class)} instead
361+
* Not working on Android platform because of JVM and Dalvik differences, please use {@link DeliveryClient#registerType(Class)} instead
362362
* Register by scanning the classpath for annotated classes by {@link ContentItemMapping} annotation.
363+
*
364+
* @param basePackage name of the base package
363365
*/
364366
@SuppressWarnings("WeakerAccess")
365367
public void scanClasspathForMappings(String basePackage) {

‎kontent-delivery/src/main/java/kentico/kontent/delivery/StronglyTypedContentItemConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ protected InlineContentItemsResolver getResolverForType(ContentItem contentItem)
9090
}
9191

9292
/**
93+
* Not working on Android platform because of JVM and Dalvik differences, please use {@link DeliveryClient#registerType(Class)} instead
9394
* @param basePackage name of the base package
94-
* @apiNote Not working on Android platform because of JVM and Dalvik differences, please use {@link DeliveryClient#registerType(Class)} instead
9595
*/
9696
protected void scanClasspathForMappings(String basePackage) {
9797
try (ScanResult scanResult = new ClassGraph()

0 commit comments

Comments
 (0)