Issue bumble-tech#47 - Converted customisations module from Android t…

…o Java
LachlanMcKee · Aug 1, 2022 · 983814f · 983814f
1 parent fb316b1
commit 983814f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git 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
@@ -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
diff --git 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'