Merge pull request #66 from mattrob33/fix/play-store-availability

Fix Play Store availability
mattrob33 · Jan 26, 2024 · 4a3dd01 · 4a3dd01
2 parents 1fb2c74 + 7c0030d
commit 4a3dd01
Show file tree

Hide file tree

Showing 45 changed files with 135 additions and 347 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,10 +1,10 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 
 plugins {
-    id("com.android.application")
-    kotlin("android")
-    kotlin("kapt")
-    id("dagger.hilt.android.plugin")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.hilt)
 }
 
 data class Version(
@@ -29,17 +29,19 @@ val localProps = Version(
  * local.properties when running local builds.
  */
 
-val appVersionCode: Int = 31
+val appVersionCode: Int = 32
 //    cliProps.code ?:
 //    localProps.code ?:
 //    throw InvalidUserDataException("No versionCode provided. You must provide a version code via CLI properties or local.properties.")
 
-val appVersionName: String = "8.0.0"
+val appVersionName: String = "8.0.1"
 //    cliProps.name ?:
 //    localProps.name ?:
 //    throw InvalidUserDataException("No versionName provided. You must provide a version name via CLI properties or local.properties.")
 
 android {
+    namespace="com.mattrobertson.greek.reader"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader">
+    >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,23 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        google()
-    }
-
-    dependencies {
-        classpath("com.android.tools.build:gradle:${libs.versions.agp.get()}")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:${libs.versions.hilt.get()}")
-    }
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-    }
-}
-
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,4 +4,5 @@ plugins {
 
 repositories {
     mavenCentral()
+    gradlePluginPortal()
 }
diff --git a/buildSrc/src/main/kotlin/AppConfig.kt b/buildSrc/src/main/kotlin/AppConfig.kt
@@ -3,11 +3,11 @@ import org.gradle.api.JavaVersion
 object AppConfig {
 
     const val minSdk = 21
-    const val compileSdk = 32
+    const val compileSdk = 34
     const val targetSdk = compileSdk
-    const val buildTools = "30.0.3"
+    const val buildTools = "34.0.0"
 
-    const val jvmTarget = "1.8"
-    val javaCompatibility = JavaVersion.VERSION_1_8
+    const val jvmTarget = "17"
+    val javaCompatibility = JavaVersion.VERSION_17
 
 }
diff --git a/core/db-api/build.gradle.kts b/core/db-api/build.gradle.kts
@@ -1,10 +1,12 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
-    kotlin("kapt")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 android {
+    namespace="com.mattrobertson.greek.reader.db.api"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/.../db-api/src/androidTest/java/com/mattrobertson/greek/reader/db/ExampleInstrumentedTest.kt b/.../db-api/src/androidTest/java/com/mattrobertson/greek/reader/db/ExampleInstrumentedTest.kt
diff --git a/core/db-api/src/main/AndroidManifest.xml b/core/db-api/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader.db.api">
+    >
 
 </manifest>
diff --git a/core/db-api/src/test/java/com/mattrobertson/greek/reader/db/ExampleUnitTest.kt b/core/db-api/src/test/java/com/mattrobertson/greek/reader/db/ExampleUnitTest.kt
diff --git a/core/db-internal/build.gradle.kts b/core/db-internal/build.gradle.kts
@@ -1,10 +1,12 @@
 plugins {
-    id("com.android.library")
-    kotlin("android")
-    kotlin("kapt")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 android {
+    namespace="com.mattrobertson.greek.reader.db.internal"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/...nternal/src/androidTest/java/com/mattrobertson/greek/reader/db/ExampleInstrumentedTest.kt b/...nternal/src/androidTest/java/com/mattrobertson/greek/reader/db/ExampleInstrumentedTest.kt
diff --git a/core/db-internal/src/main/AndroidManifest.xml b/core/db-internal/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader.db.internal">
+    >
 
 </manifest>
diff --git a/core/db-internal/src/test/java/com/mattrobertson/greek/reader/db/ExampleUnitTest.kt b/core/db-internal/src/test/java/com/mattrobertson/greek/reader/db/ExampleUnitTest.kt
diff --git a/core/settings/build.gradle.kts b/core/settings/build.gradle.kts
@@ -1,12 +1,12 @@
-import org.jetbrains.kotlin.kapt3.base.Kapt.kapt
-
 plugins {
-    id("com.android.library")
-    id("kotlin-android")
-    kotlin("kapt")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
 }
 
 android {
+    namespace="com.mattrobertson.greek.reader.settings"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/core/settings/src/main/AndroidManifest.xml b/core/settings/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader.settings">
+    >
 
 </manifest>
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -1,13 +1,15 @@
 import com.google.protobuf.gradle.*
 
 plugins {
-    id("com.android.library")
-    kotlin("android")
-    kotlin("kapt")
-    id("com.google.protobuf") version "0.8.12"
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.protobuf)
 }
 
 android {
+    namespace="com.mattrobertson.greek.reader.ui"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 
@@ -63,12 +65,13 @@ dependencies {
 
 protobuf {
     protoc {
-        // latest version number: https://mvnrepository.com/artifact/com.google.protobuf/protoc
-        artifact = "com.google.protobuf:protoc:3.10.0"
+        // find latest version number here:
+        // https://mvnrepository.com/artifact/com.google.protobuf/protoc
+        artifact = libs.protobuf.protoc.get().toString()
     }
     generateProtoTasks {
         all().forEach { task ->
-            task.plugins{
+            task.builtins {
                 create("java") {
                     option("lite")
                 }

diff --git a/core/ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader.ui">
+    >
 
 </manifest>
diff --git a/core/ui/src/test/java/com/mattrobertson/greek/reader/ui/ExampleUnitTest.kt b/core/ui/src/test/java/com/mattrobertson/greek/reader/ui/ExampleUnitTest.kt
diff --git a/core/verseref/build.gradle.kts b/core/verseref/build.gradle.kts
@@ -1,9 +1,11 @@
 plugins {
-    id("com.android.library")
-    id("kotlin-android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
+    namespace = "com.mattrobertson.greek.reader.verseref"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/core/verseref/src/main/AndroidManifest.xml b/core/verseref/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mattrobertson.greek.reader.verseref">
+    >
 
 </manifest>
diff --git a/feature/audio/build.gradle.kts b/feature/audio/build.gradle.kts
@@ -1,13 +1,13 @@
-import org.jetbrains.kotlin.kapt3.base.Kapt.kapt
-
 plugins {
-    id("com.android.library")
-    kotlin("android")
-    kotlin("kapt")
-    id("dagger.hilt.android.plugin")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.hilt)
 }
 
 android {
+    namespace="com.mattrobertson.greek.reader.audio"
+
     compileSdk = AppConfig.compileSdk
     buildToolsVersion = AppConfig.buildTools
 

diff --git a/...udio/src/androidTest/java/com/mattrobertson/greek/reader/audio/ExampleInstrumentedTest.kt b/...udio/src/androidTest/java/com/mattrobertson/greek/reader/audio/ExampleInstrumentedTest.kt