-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into cn-sync-images
- Loading branch information
Showing
221 changed files
with
8,966 additions
and
4,266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,96 @@ | ||
plugins { | ||
id("com.android.application") | ||
id("org.jetbrains.kotlin.android") | ||
id("com.google.devtools.ksp") | ||
kotlin("kapt") | ||
} | ||
|
||
android { | ||
namespace = "io.jans.chip" | ||
compileSdk = 33 | ||
namespace = "io.jans.jans_chip" | ||
compileSdk = 34 | ||
|
||
defaultConfig { | ||
applicationId = "io.jans.chip" | ||
minSdk = 24 | ||
targetSdk = 33 | ||
applicationId = "io.jans.jans_chip" | ||
minSdk = 28 | ||
targetSdk = 34 | ||
versionCode = 1 | ||
versionName = "1.0" | ||
|
||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
vectorDrawables { | ||
useSupportLibrary = true | ||
} | ||
} | ||
|
||
buildTypes { | ||
release { | ||
isMinifyEnabled = false | ||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") | ||
proguardFiles( | ||
getDefaultProguardFile("proguard-android-optimize.txt"), | ||
"proguard-rules.pro" | ||
) | ||
} | ||
} | ||
compileOptions { | ||
sourceCompatibility = JavaVersion.VERSION_1_8 | ||
targetCompatibility = JavaVersion.VERSION_1_8 | ||
sourceCompatibility = JavaVersion.VERSION_17 | ||
targetCompatibility = JavaVersion.VERSION_17 | ||
} | ||
kotlinOptions { | ||
jvmTarget = "17" | ||
} | ||
buildFeatures { | ||
compose = true | ||
} | ||
composeOptions { | ||
kotlinCompilerExtensionVersion = "1.4.3" | ||
} | ||
packaging { | ||
resources { | ||
excludes += "/META-INF/{AL2.0,LGPL2.1}" | ||
} | ||
} | ||
} | ||
|
||
dependencies { | ||
val room_version = "2.5.2" | ||
|
||
implementation("androidx.room:room-runtime:$room_version") | ||
annotationProcessor("androidx.room:room-compiler:$room_version") | ||
|
||
implementation("androidx.appcompat:appcompat:1.6.1") | ||
implementation("com.google.android.material:material:1.9.0") | ||
implementation("androidx.constraintlayout:constraintlayout:2.1.4") | ||
implementation("com.squareup.retrofit2:retrofit:2.9.0") | ||
implementation("com.squareup.retrofit2:converter-gson:2.9.0") | ||
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.11") | ||
implementation("com.google.code.google-collections:google-collect:snapshot-20080530") | ||
|
||
implementation(project(mapOf("path" to ":webauthn"))) | ||
implementation("io.coil-kt:coil-compose:2.6.0") | ||
//implementation("androidx.credentials:credentials:1.3.0-alpha01") | ||
val roomVersion = "2.5.2" | ||
implementation("androidx.room:room-ktx:$roomVersion") | ||
ksp("androidx.room:room-compiler:$roomVersion") | ||
implementation("androidx.compose.material:material-icons-extended:1.5.4") | ||
implementation("androidx.core:core-ktx:1.9.0") | ||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") | ||
implementation("androidx.activity:activity-compose:1.8.2") | ||
implementation(platform("androidx.compose:compose-bom:2023.03.00")) | ||
implementation("androidx.compose.ui:ui") | ||
implementation("androidx.compose.ui:ui-graphics") | ||
implementation("androidx.compose.ui:ui-tooling-preview") | ||
implementation("androidx.compose.material3:material3:1.1.1") | ||
implementation("androidx.core:core-splashscreen:1.1.0-rc01") | ||
implementation("androidx.navigation:navigation-compose:2.8.0-alpha06") | ||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1-Beta") | ||
implementation("com.squareup.retrofit2:retrofit:2.11.0") | ||
implementation("com.squareup.retrofit2:converter-gson:2.11.0") | ||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1-Beta") | ||
implementation("com.nimbusds:nimbus-jose-jwt:9.31") | ||
implementation("io.jsonwebtoken:jjwt:0.9.1") | ||
implementation("javax.xml.bind:jaxb-api:2.4.0-b180830.0359") | ||
implementation("com.nimbusds:nimbus-jose-jwt:9.31") | ||
implementation("com.google.android.play:integrity:1.2.0") | ||
implementation("android.arch.lifecycle:viewmodel:1.1.1") | ||
implementation ("androidx.appcompat:appcompat:1.4.0") | ||
implementation("androidx.biometric:biometric:1.2.0-alpha05") | ||
implementation("com.github.MahboubehSeyedpour:jetpack-loading:1.1.0") | ||
|
||
testImplementation("junit:junit:4.13.2") | ||
androidTestImplementation("androidx.test.ext:junit:1.1.5") | ||
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") | ||
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00")) | ||
androidTestImplementation("androidx.compose.ui:ui-test-junit4") | ||
debugImplementation("androidx.compose.ui:ui-tooling") | ||
debugImplementation("androidx.compose.ui:ui-test-manifest") | ||
} | ||
|
||
kapt { | ||
correctErrorTypes = true | ||
} |
24 changes: 24 additions & 0 deletions
24
demos/jans-chip/android/app/src/androidTest/java/io/jans/chip/ExampleInstrumentedTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package io.jans.chip | ||
|
||
import androidx.test.platform.app.InstrumentationRegistry | ||
import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
|
||
import org.junit.Test | ||
import org.junit.runner.RunWith | ||
|
||
import org.junit.Assert.* | ||
|
||
/** | ||
* 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("io.jans.jans_chip1", appContext.packageName) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 0 additions & 67 deletions
67
demos/jans-chip/android/app/src/main/java/io/jans/chip/AfterLoginActivity.java
This file was deleted.
Oops, something went wrong.
50 changes: 0 additions & 50 deletions
50
demos/jans-chip/android/app/src/main/java/io/jans/chip/AppDatabase.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.