Remove additional sample modules, refactor buildSrc objects

G00fY2 · Jan 31, 2021 · c1a5366 · c1a5366
1 parent 743066e
commit c1a5366
Show file tree

Hide file tree

Showing 69 changed files with 56 additions and 714 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -21,19 +21,19 @@ jobs:
         run: ./gradlew ktlintCheck
 
   build_bundled:
-    name: Build bundled debug apps
+    name: Build bundled debug
     runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
       - name: Build debug bundled sample app
-        run: ./gradlew :activity-sample:assembleBundledDebug :advanced-sample:assembleBundledDebug :fragment-sample:assembleBundledDebug
+        run: ./gradlew :sample:assembleBundledDebug
 
   build_unbundled:
-    name: Build unbundled debug apps
+    name: Build unbundled debug
     runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
       - name: Build debug unbundled sample app
-        run: ./gradlew :activity-sample:assembleUnbundledDebug :advanced-sample:assembleUnbundledDebug :fragment-sample:assembleUnbundledDebug
+        run: ./gradlew :sample:assembleUnbundledDebug
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,7 +36,7 @@ subprojects {
 
 tasks.named("dependencyUpdates", DependencyUpdatesTask::class.java).configure {
   gradleReleaseChannel = "current"
-  rejectVersionIf { Utils.isNonStable(candidate.version) && !Utils.isNonStable(currentVersion) }
+  rejectVersionIf { Versions.isNonStable(candidate.version) && !Versions.isNonStable(currentVersion) }
 }
 
 repositories {

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -9,8 +9,6 @@ object Deps {
     const val camera = "androidx.camera:camera-camera2:${Versions.cameraX}"
     const val cameraLifecycle = "androidx.camera:camera-lifecycle:${Versions.cameraX}"
     const val cameraPreview = "androidx.camera:camera-view:${Versions.cameraView}"
-
-    const val navigation = "androidx.navigation:navigation-fragment-ktx:${Versions.navigation}"
   }
 
   object Mdc {

diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,25 +1,31 @@
 object Versions {
 
+  const val androidMinSdk = 21
+  const val androidCompileSdk = 30
+  const val androidTargetSdk = 30
+  const val androidBuildTools = "30.0.3"
+
   const val androidGradle = "4.1.2"
   const val kotlin = "1.4.21"
 
-  const val ktlintPlugin = "9.4.1"
-  const val ktlint = "0.40.0"
-  const val gradleVersions = "0.36.0"
-  const val dokka = "1.4.20"
-
   const val activity = "1.2.0-rc01"
   const val fragment = "1.3.0-rc02"
   const val appcompat = "1.2.0"
   const val core = "1.3.2"
 
-  const val navigation = "2.3.3"
-
   const val cameraX = "1.0.0-rc02"
   const val cameraView = "1.0.0-alpha21"
 
   const val materialDesign = "1.2.1"
 
   const val barcodeScanning = "16.1.1"
   const val barcodeScanningGms = "16.1.4"
+
+  const val ktlintPlugin = "9.4.1"
+  const val ktlint = "0.40.0"
+  const val gradleVersions = "0.36.0"
+  const val dokka = "1.4.20"
+
+  fun isNonStable(version: String) = listOf("alpha", "beta", "rc", "cr", "m", "preview")
+    .any { version.matches(".*[.\\-]$it[.\\-\\d]*".toRegex(RegexOption.IGNORE_CASE)) }
 }
diff --git a/quickie/build.gradle.kts b/quickie/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 }
 
 android {
-  compileSdkVersion(Config.androidCompileSdkVersion)
-  defaultConfig.minSdkVersion(Config.androidMinSdkVersion)
+  compileSdkVersion(Versions.androidCompileSdk)
+  defaultConfig.minSdkVersion(Versions.androidMinSdk)
   resourcePrefix = project.name
   buildFeatures {
     viewBinding = true

diff --git a/quickie/src/main/kotlin/com/g00fy2/quickie/content/QRContent.kt b/quickie/src/main/kotlin/com/g00fy2/quickie/content/QRContent.kt
@@ -1,6 +1,5 @@
 package com.g00fy2.quickie.content
 
-@Suppress("unused")
 public sealed class QRContent(public val rawValue: String) {
 
   override fun toString(): String = rawValue

diff --git a/sample/activity-sample/.gitignore → sample/.gitignore b/sample/activity-sample/.gitignore → sample/.gitignore
diff --git a/sample/activity-sample/build.gradle.kts b/sample/activity-sample/build.gradle.kts
diff --git a/sample/activity-sample/src/main/AndroidManifest.xml b/sample/activity-sample/src/main/AndroidManifest.xml
diff --git a/sample/advanced-sample/.gitignore b/sample/advanced-sample/.gitignore
diff --git a/sample/advanced-sample/proguard-rules.pro b/sample/advanced-sample/proguard-rules.pro
diff --git a/sample/advanced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/MainActivity.kt b/sample/advanced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/MainActivity.kt
diff --git a/sample/advanced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/MainViewModel.kt b/sample/advanced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/MainViewModel.kt
diff --git a/...anced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/livedata/SingleLiveEvent.kt b/...anced-sample/src/main/kotlin/com/g00fy2/quickieadvancedsample/livedata/SingleLiveEvent.kt