Migrated Barricade1 to Barricade2

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/build.gradle

@@ -1,82 +1,84 @@
-apply plugin: 'com.android.application'
-
-buildscript {
-  repositories {
-    jcenter()
-    mavenCentral()
-  }
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'com.google.devtools.ksp' version "1.6.10-1.0.4"
 }
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+    compileSdk 32
+
+    defaultConfig {
+        applicationId "com.mutualmobile.barricade"
+        minSdk 21
+        targetSdk 32
+        versionCode 1
+        versionName "1.0"
 
-  defaultConfig {
-    applicationId "com.mutualmobile.barricade.sample"
-    minSdkVersion 16
-    targetSdkVersion 28
-    versionCode 1
-    versionName "1.0"
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-  }
-  buildTypes {
-    release {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
-  }
 
-  testOptions {
-    unitTests.all {
-      // All the usual Gradle options.
-      testLogging {
-        events "passed", "skipped", "failed", "standardOut", "standardError"
-        outputs.upToDateWhen { false }
-        showStandardStreams = true
-      }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        kotlin {
+            kotlinOptions {
+                freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+            }
+        }
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
+    sourceSets {
+        debug {
+            kotlin { srcDir(file("build/generated/ksp/debug/kotlin")) }
+        }
+        release {
+            kotlin { srcDir(file("build/generated/ksp/release/kotlin")) }
+        }
     }
-  }
 }
 
-
-
 dependencies {
-  implementation "androidx.appcompat:appcompat:${SUPPORT_LIB_VERSION}"
-  implementation "androidx.cardview:cardview:${SUPPORT_LIB_VERSION}"
-
-  implementation project(':barricade')
-  annotationProcessor project(':barricade-compiler')
-
-  implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
-
-  implementation "com.squareup.retrofit2:retrofit:${RETROFIT_VERSION}"
-  implementation "com.squareup.retrofit2:converter-gson:${RETROFIT_VERSION}"
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'com.google.truth:truth:0.35'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation 'androidx.activity:activity-compose:1.3.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation implementation(project(':barricade',))
 
-  androidTestImplementation "androidx.test.espresso:espresso-core:${ESPRESSO_VERSION}"
-  androidTestImplementation "androidx.test:runner:${RUNNER_VERSION}"
-  androidTestImplementation "androidx.annotation:annotation:${SUPPORT_LIB_VERSION}"
+    implementation(project(":barricade-annotations"))
+    ksp(project(":barricade-compiler"))
 
-  androidTestImplementation 'com.jakewharton.espresso:okhttp3-idling-resource:1.0.0'
-  androidTestImplementation "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
-  androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0-alpha4') {
-    // Necessary to avoid version conflicts
-    exclude group: 'com.android.support', module: 'appcompat'
-    exclude group: 'com.android.support', module: 'support-v4'
-    exclude group: 'com.android.support', module: 'support-annotations'
-    exclude module: 'recyclerview-v7'
-  }
-  implementation project(path: ':barricade-annotations')
-}
-
-
-configurations.all {
-  resolutionStrategy {
-    // cache dynamic versions for 10 minutes
-    cacheDynamicVersionsFor 10*60, 'seconds'
-    // don't cache changing modules at all
-    cacheChangingModulesFor 0, 'seconds'
-  }
-}
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
+    implementation("io.coil-kt:coil-compose:2.0.0-rc01")
+}

app/proguard-rules.pro

@@ -1,30 +1,21 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/mustafa/Development/android-sdk-macosx/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--dontwarn okio.**
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on Java 8 VMs. Will not be used at runtime.
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
--keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
--keepattributes Exceptions
 
--dontwarn okhttp3.**
--dontwarn okio.**
--dontwarn retrofit2.**
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/src/androidTest/java/com/mutualmobile/barricade/ExampleInstrumentedTest.kt

@@ -0,0 +1,22 @@
+package com.mutualmobile.barricade
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.mutualmobile.barricade", appContext.packageName)
+    }
+}