diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..5b25f9f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+AndroidHKDFLib
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c6fcd01..9079387 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 933d158..9a21223 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66..31e0562 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/androidhkdf/build.gradle b/androidhkdf/build.gradle
index 5eb8d60..8cfee21 100644
--- a/androidhkdf/build.gradle
+++ b/androidhkdf/build.gradle
@@ -1,19 +1,15 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'maven-publish'
-group='com.github.TICESoftware'
+group = 'com.github.TICESoftware'
android {
- compileSdkVersion 30
- buildToolsVersion "29.0.3"
+ compileSdkVersion 34
defaultConfig {
- minSdkVersion 19
- targetSdkVersion 30
- versionCode 1
- versionName "1.2.0"
+ minSdkVersion 21
+ targetSdkVersion 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
@@ -25,23 +21,46 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ namespace 'com.ticeapp.androidhkdf'
+ kotlinOptions {
+ jvmTarget = "17"
+ }
+ compileOptions {
+ sourceCompatibility 17
+ targetCompatibility 17
+ }
+}
+afterEvaluate {
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ groupId = 'com.ticeapp.TICESoftware'
+ artifactId = 'androidhkdf'
+ version = '1.4'
+ afterEvaluate {
+ from components.release
+ }
+ }
+ }
+ }
}
repositories {
+ mavenLocal()
maven {
- url "https://dl.bintray.com/terl/lazysodium-maven"
+ url "https://dl.bintray.com/terl/lazysodium-maven"
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.core:core-ktx:1.3.2'
- testImplementation 'junit:junit:4.13.1'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
- implementation "com.goterl:lazysodium-android:5.0.2@aar"
- implementation 'net.java.dev.jna:jna:5.8.0@aar'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.core:core-ktx:1.10.1'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+ implementation "com.goterl:lazysodium-android:5.1.0@aar"
+ implementation 'net.java.dev.jna:jna:5.13.0@aar'
}
diff --git a/androidhkdf/src/main/AndroidManifest.xml b/androidhkdf/src/main/AndroidManifest.xml
index 7b8106c..94cbbcf 100644
--- a/androidhkdf/src/main/AndroidManifest.xml
+++ b/androidhkdf/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 0aaa117..930a6f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
android {
- compileSdkVersion 30
- buildToolsVersion "29.0.3"
+ compileSdkVersion 34
defaultConfig {
applicationId "com.ticeapp.androidhkdfapp"
- minSdkVersion 19
- targetSdkVersion 30
+ minSdkVersion 21
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
@@ -22,25 +20,29 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
-
+ namespace 'com.ticeapp.androidhkdfapp'
+ kotlinOptions {
+ jvmTarget = "17"
+ }
+ compileOptions {
+ sourceCompatibility 17
+ targetCompatibility 17
+ }
}
-
repositories {
- maven {
- url "https://dl.bintray.com/terl/lazysodium-maven"
- }
+ maven { url "https://dl.bintray.com/terl/lazysodium-maven" }
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.core:core-ktx:1.3.2'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- testImplementation 'junit:junit:4.13.1'
- androidTestImplementation 'androidx.test.ext:junit:1.1.2'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.core:core-ktx:1.10.1'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ testImplementation 'junit:junit:4.13.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation project(":androidhkdf")
- implementation "com.goterl:lazysodium-android:5.0.2@aar"
- implementation 'net.java.dev.jna:jna:5.8.0@aar'
+ implementation "com.goterl:lazysodium-android:5.1.0@aar"
+ implementation 'net.java.dev.jna:jna:5.13.0@aar'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 49e4206..bdb1e58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
-
+
diff --git a/build.gradle b/build.gradle
index 0f3c847..01d3e82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.10'
+ ext.kotlin_version = '1.8.20'
repositories {
google()
jcenter()
-
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.0'
+ classpath 'com.android.tools.build:gradle:8.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
-
allprojects {
repositories {
google()
jcenter()
-
}
}
-
task clean(type: Delete) {
delete rootProject.buildDir
}
diff --git a/gradle.properties b/gradle.properties
index 23339e0..9e73ebc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7407de6..d35a9c4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip