From 983814f0852c3428683f52b48e0fc4190c30ef23 Mon Sep 17 00:00:00 2001
From: Lachlan McKee <lachlan.mckee@team.bumble.com>
Date: Mon, 1 Aug 2022 16:50:40 +0100
Subject: [PATCH] Issue #47 - Converted customisations module from Android to
 Java

---
 CHANGELOG.md                                |  1 +
 customisations/build.gradle                 | 24 +++++----------------
 customisations/src/main/AndroidManifest.xml |  2 --
 gradle/publication.gradle                   | 23 ++++++++++++++------
 4 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 customisations/src/main/AndroidManifest.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746f5ce782..34e21086c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Pending changes
 
 - [#38](https://github.com/bumble-tech/appyx/pull/38) – Added: JUnit5 support.
+- [#47](https://github.com/bumble-tech/appyx/issues/47) – Updated: The 'customisations' module is now pure Java/Kotlin.
 
 ## 1.0-alpha02
 
diff --git a/customisations/build.gradle b/customisations/build.gradle
index 5623656b52..b8e220528c 100644
--- a/customisations/build.gradle
+++ b/customisations/build.gradle
@@ -1,25 +1,11 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
+    id 'java-library'
+    id 'kotlin'
 }
 
 apply from: '../gradle/publication.gradle'
 
-android {
-    namespace = "com.bumble.appyx.utils.customisations"
-    compileSdk 32
-
-    defaultConfig {
-        minSdk 21
-        targetSdk 32
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
-    }
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
diff --git a/customisations/src/main/AndroidManifest.xml b/customisations/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/customisations/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/gradle/publication.gradle b/gradle/publication.gradle
index ebbd421a8e..4099e6715c 100644
--- a/gradle/publication.gradle
+++ b/gradle/publication.gradle
@@ -1,20 +1,31 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-android {
-    publishing {
-        singleVariant('release') {
-            withSourcesJar()
-            withJavadocJar()
+if (pluginManager.hasPlugin("com.android.library")) {
+    android {
+        publishing {
+            singleVariant('release') {
+                withSourcesJar()
+                withJavadocJar()
+            }
         }
     }
+} else {
+    java {
+        withJavadocJar()
+        withSourcesJar()
+    }
 }
 
 afterEvaluate { Project project ->
     publishing {
         publications {
             appyxRelease(MavenPublication) {
-                from components.release
+                if (pluginManager.hasPlugin("com.android.library")) {
+                    from components.release
+                } else {
+                    from components.java
+                }
                 groupId = 'com.bumble.appyx'
                 version = project.findProperty('snapshot') == 'true' ? 'main-SNAPSHOT' : '1.0-alpha02'