diff --git a/README.md b/README.md index 024c723..9fbe47a 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ expected to be called only once per app's lifecycle, so the best place for doing of your app's `Application` class. ```kotlin -import com.securevale.rasp.android.native.SecureApp +import com.securevale.rasp.android.SecureApp class SampleApplication : Application() { diff --git a/build.gradle.kts b/build.gradle.kts index f4cdd86..7d8574c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,8 @@ plugins { id("com.vanniktech.maven.publish") version "0.25.2" } -val versionCode by extra { 6 } -val versionName by extra { "0.6.0" } +val versionCode by extra { 7 } +val versionName by extra { "0.6.3" } val minSdkVersion by extra { 24 } val compileSdkVersion by extra { 34 } val targetSdkVersion by extra { 34 } diff --git a/native/src/lib.rs b/native/src/lib.rs index f4d3629..f063cf4 100644 --- a/native/src/lib.rs +++ b/native/src/lib.rs @@ -17,7 +17,7 @@ const EXTENDED_LOGGING: bool = false; #[allow(clippy::missing_safety_doc)] #[no_mangle] -pub unsafe extern "C" fn Java_com_securevale_rasp_android_native_SecureApp_initJni( +pub unsafe extern "C" fn Java_com_securevale_rasp_android_SecureApp_initJni( _env: JNIEnv, _class: JClass, ) { diff --git a/rasp/build.gradle.kts b/rasp/build.gradle.kts index 3c2eb6a..4846077 100644 --- a/rasp/build.gradle.kts +++ b/rasp/build.gradle.kts @@ -24,7 +24,7 @@ android { buildTypes { getByName("release") { isMinifyEnabled = false - consumerProguardFiles( "consumer-rules.pro") + consumerProguardFiles("consumer-rules.pro") } getByName("debug") { @@ -93,12 +93,13 @@ fun configureDokka(dokkaTask: DokkaTask, outputDir: String) = dokkaTask.apply { } mavenPublishing { + group = "com.securevale.rasp" - version = "0.6.0" - coordinates("com.securevale", "rasp-android", "0.6.0") + version = rootProject.extra["versionName"] as String + coordinates("com.securevale", "rasp-android", rootProject.extra["versionName"] as String) publishToMavenCentral(SonatypeHost.S01, true) - signAllPublications() +// signAllPublications() pom { name.set("Android RASP") diff --git a/rasp/src/main/java/com/securevale/rasp/android/native/SecureApp.kt b/rasp/src/main/java/com/securevale/rasp/android/SecureApp.kt similarity index 90% rename from rasp/src/main/java/com/securevale/rasp/android/native/SecureApp.kt rename to rasp/src/main/java/com/securevale/rasp/android/SecureApp.kt index f98498c..5ac8878 100644 --- a/rasp/src/main/java/com/securevale/rasp/android/native/SecureApp.kt +++ b/rasp/src/main/java/com/securevale/rasp/android/SecureApp.kt @@ -1,4 +1,4 @@ -package com.securevale.rasp.android.native +package com.securevale.rasp.android /** * Library initalisation object. diff --git a/sample-app/src/main/java/com/securevale/rasp/android/sample/SampleApplication.kt b/sample-app/src/main/java/com/securevale/rasp/android/sample/SampleApplication.kt index 29e2a09..35e181d 100644 --- a/sample-app/src/main/java/com/securevale/rasp/android/sample/SampleApplication.kt +++ b/sample-app/src/main/java/com/securevale/rasp/android/sample/SampleApplication.kt @@ -1,7 +1,7 @@ package com.securevale.rasp.android.sample import android.app.Application -import com.securevale.rasp.android.native.SecureApp +import com.securevale.rasp.android.SecureApp class SampleApplication : Application() { diff --git a/sample-app/src/main/jniLibs/arm64-v8a/libnative.so b/sample-app/src/main/jniLibs/arm64-v8a/libnative.so index e0b0092..20316f1 100755 Binary files a/sample-app/src/main/jniLibs/arm64-v8a/libnative.so and b/sample-app/src/main/jniLibs/arm64-v8a/libnative.so differ diff --git a/sample-app/src/main/jniLibs/armeabi-v7a/libnative.so b/sample-app/src/main/jniLibs/armeabi-v7a/libnative.so index c6c2f99..d1ea238 100755 Binary files a/sample-app/src/main/jniLibs/armeabi-v7a/libnative.so and b/sample-app/src/main/jniLibs/armeabi-v7a/libnative.so differ diff --git a/sample-app/src/main/jniLibs/x86/libnative.so b/sample-app/src/main/jniLibs/x86/libnative.so index 9f5807c..e3e4463 100755 Binary files a/sample-app/src/main/jniLibs/x86/libnative.so and b/sample-app/src/main/jniLibs/x86/libnative.so differ diff --git a/sample-app/src/main/jniLibs/x86_64/libnative.so b/sample-app/src/main/jniLibs/x86_64/libnative.so index 7205bb0..5795c30 100755 Binary files a/sample-app/src/main/jniLibs/x86_64/libnative.so and b/sample-app/src/main/jniLibs/x86_64/libnative.so differ