Skip to content

Commit dc062ae

Browse files
authored
Merge pull request #10 from u4i-admin/V2
V2
2 parents 8dbc9c1 + 38204f4 commit dc062ae

File tree

173 files changed

+5901
-4246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+5901
-4246
lines changed

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 34 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

Codex/build.gradle

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 30
7-
buildToolsVersion "30.0.2"
6+
compileSdkVersion 33
87

98
defaultConfig {
109
minSdkVersion 29
11-
targetSdkVersion 30
12-
versionCode 1
13-
versionName "1.0"
10+
targetSdkVersion 33
1411

1512
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1613
consumerProguardFiles "consumer-rules.pro"
@@ -22,15 +19,16 @@ android {
2219
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2320
}
2421
}
22+
namespace 'org.nahoft.codex'
2523
}
2624

2725
dependencies {
2826
implementation fileTree(dir: "libs", include: ["*.jar"])
2927
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
30-
implementation 'androidx.core:core-ktx:1.3.2'
31-
implementation 'androidx.appcompat:appcompat:1.2.0'
32-
testImplementation 'junit:junit:4.13.1'
33-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
34-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
28+
implementation 'androidx.core:core-ktx:1.9.0'
29+
implementation 'androidx.appcompat:appcompat:1.5.1'
30+
testImplementation 'junit:junit:4.13.2'
31+
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
32+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
3533

3634
}

Codex/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="org.nahoft.codex">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
/
54
</manifest>

app/build.gradle

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'com.google.gms.google-services'
55

66
android {
7-
compileSdkVersion 30
8-
buildToolsVersion "30.0.2"
7+
compileSdkVersion 33
8+
buildToolsVersion "32.0.0"
99

1010
compileOptions {
1111
sourceCompatibility JavaVersion.VERSION_1_8
@@ -24,9 +24,9 @@ android {
2424
defaultConfig {
2525
applicationId "org.nahoft.nahoft"
2626
minSdkVersion 26
27-
targetSdkVersion 30
28-
versionCode 1
29-
versionName "1.0"
27+
targetSdkVersion 33
28+
versionCode 9
29+
versionName "2.0.5"
3030

3131
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3232
}
@@ -40,6 +40,10 @@ android {
4040
// applicationIdSuffix ".debug"
4141
// }
4242
}
43+
buildFeatures {
44+
viewBinding true
45+
}
46+
namespace 'org.nahoft.nahoft'
4347
}
4448

4549
dependencies {
@@ -49,14 +53,17 @@ dependencies {
4953
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5054

5155
// Jetpack Security Library
52-
implementation 'androidx.security:security-crypto:1.1.0-alpha03'
56+
implementation 'androidx.security:security-crypto:1.1.0-alpha06'
57+
58+
//Biometric
59+
implementation 'androidx.biometric:biometric:1.1.0'
5360

54-
implementation 'androidx.core:core-ktx:1.3.2'
55-
implementation 'androidx.appcompat:appcompat:1.2.0'
56-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
57-
implementation 'androidx.recyclerview:recyclerview:1.2.0'
58-
implementation 'androidx.fragment:fragment-ktx:1.3.3'
59-
implementation 'com.google.android.material:material:1.3.0'
61+
implementation 'androidx.core:core-ktx:1.9.0'
62+
implementation 'androidx.appcompat:appcompat:1.5.1'
63+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
64+
implementation 'androidx.recyclerview:recyclerview:1.3.0'
65+
implementation 'androidx.fragment:fragment-ktx:1.5.7'
66+
implementation 'com.google.android.material:material:1.9.0'
6067

6168
implementation('com.squareup.retrofit2:converter-simplexml:2.9.0') {
6269
exclude group: 'xpp3', module: 'xpp3'
@@ -65,15 +72,13 @@ dependencies {
6572
}
6673

6774
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
68-
implementation 'com.google.android.material:material:1.3.0'
69-
7075
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
7176

72-
testImplementation 'junit:junit:4.13.1'
73-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
74-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
77+
testImplementation 'junit:junit:4.13.2'
78+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
79+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
7580
testImplementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
7681
androidTestImplementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
7782

78-
implementation 'com.google.firebase:firebase-analytics:17.4.1'
83+
implementation 'com.google.firebase:firebase-analytics:21.2.2'
7984
}

0 commit comments

Comments
 (0)