Merge v1.0-beta-16 changes from develop

Merge changes for v1.0-beta-16.
KotlinGeekDev · Feb 20, 2025 · be28a1e · be28a1e
2 parents 0807168 + 24516dd
commit be28a1e
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 57 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,7 +4,7 @@ on:
 #  push:
 #   branches: ["develop"]
   release:
-    types: [released]
+    types: [released, prereleased]
 
 concurrency:
   group: ${{ github.ref }}

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ You can include the library from either Maven Central or Jitpack.
 You can include the library in the common source set like this:
 ```kotlin
 dependencies {
-    implementation("io.github.kotlingeekdev:rhodium:1.0-beta-15")
+    implementation("io.github.kotlingeekdev:rhodium:1.0-beta-16")
 
 }
 ```
@@ -74,7 +74,7 @@ then, in your module's `build.gradle(.kts)`, you need to add:
 // build.gradle.kts
 dependencies {
     //...
-    implementation("com.github.KotlinGeekDev.Rhodium:rhodium:1.0-beta-15")
+    implementation("com.github.KotlinGeekDev.Rhodium:rhodium:1.0-beta-16")
 
 
 }
@@ -85,7 +85,7 @@ If you're including it in an Android app, you can just add:
 // app/build.gradle.kts
 dependencies {
     //...
-    implementation("com.github.KotlinGeekDev.Rhodium:rhodium-android:1.0-beta-15")
+    implementation("com.github.KotlinGeekDev.Rhodium:rhodium-android:1.0-beta-16")
 
 }
 ```

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ allprojects {
     val isJitpack = System.getenv("JITPACK") == "true"
 
     group = "io.github.kotlingeekdev"
-    version = "1.0-beta-15"
+    version = "1.0-beta-16"
 
 
 //    val javadocJar = tasks.register<Jar>("javadocJar") {

diff --git a/rhodium-core/build.gradle.kts b/rhodium-core/build.gradle.kts
@@ -19,6 +19,27 @@ plugins {
 //    `maven-publish`
 }
 
+android {
+    namespace = "io.github.kotlingeekdev.rhodium.android"
+    compileSdk = 34
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 34
+        compileSdk = 34
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = false
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+}
+
 
 kotlin {
     //explicitApi()
@@ -45,7 +66,7 @@ kotlin {
     }
 
 
-    androidTarget {
+    androidTarget() {
 
         publishAllLibraryVariants()
         @OptIn(ExperimentalKotlinGradlePluginApi::class)
@@ -78,7 +99,6 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
-
     applyDefaultHierarchyTemplate()
 
     sourceSets {
@@ -119,7 +139,6 @@ kotlin {
         }
 
         val commonJvmMain by getting {
-            dependsOn(commonMain.get())
 
             dependencies {
                 implementation("dev.whyoleg.cryptography:cryptography-provider-jdk:$kotlinCryptoVersion")
@@ -132,7 +151,6 @@ kotlin {
         }
 
         val commonJvmTest by getting {
-            dependsOn(commonTest.get())
 
             dependencies {
                 implementation(kotlin("test-junit5"))
@@ -148,20 +166,29 @@ kotlin {
 
 
 
-        val androidMain by getting {
+        androidMain.configure {
 
             dependencies {
                 implementation("androidx.appcompat:appcompat:1.7.0")
+                //        coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
+                implementation("dev.whyoleg.cryptography:cryptography-provider-jdk:$kotlinCryptoVersion")
+                implementation("com.squareup.okhttp3:okhttp:4.12.0")
+                implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
                 implementation("fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.15.0")
             }
         }
 
-        androidInstrumentedTest.configure {
-//            dependsOn(commonJvmTest)
+        androidUnitTest.configure {
+            dependencies {
+                implementation("junit:junit:4.13.2")
+            }
         }
 
-        val androidUnitTest by getting {
-//            dependsOn(commonJvmTest)
+        androidInstrumentedTest.configure {
+            dependencies {
+                implementation("androidx.test.ext:junit:1.2.1")
+                implementation("androidx.test.espresso:espresso-core:3.6.1")
+            }
         }
 
         linuxMain.configure {
@@ -180,6 +207,7 @@ kotlin {
         }
 
         appleMain.configure {
+            dependsOn(commonMain.get())
             dependencies {
                 implementation("io.ktor:ktor-client-darwin:$ktorVersion")
                 implementation("dev.whyoleg.cryptography:cryptography-provider-apple:$kotlinCryptoVersion")
@@ -191,49 +219,6 @@ kotlin {
     }
 }
 
-android {
-    namespace = "io.github.kotlingeekdev.rhodium.android"
-    compileSdk = 34
-    defaultConfig {
-        minSdk = 21
-        targetSdk = 34
-        compileSdk = 34
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            aarMetadata {
-
-            }
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            isMinifyEnabled = true
-        }
-        debug {
-            aarMetadata {
-
-            }
-            isMinifyEnabled = false
-        }
-    }
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = false
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    dependencies {
-//        coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
-        testImplementation("junit:junit:4.13.2")
-        androidTestImplementation("androidx.test.ext:junit:1.2.1")
-        androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    }
-
-}
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>() {
     compilerOptions {

diff --git a/rhodium-core/consumer-rules.pro b/rhodium-core/consumer-rules.pro
@@ -1,2 +1,26 @@
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# preserve the line number information for debugging stack traces.
+-dontobfuscate
+-keepattributes LocalVariableTable
+-keepattributes LocalVariableTypeTable
+-keepattributes *Annotation*
+-keepattributes SourceFile
+-keepattributes LineNumberTable
+-keepattributes Signature
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes EnclosingMethod
+-keepattributes MethodParameters
+-keepparameternames
+
+
+# Keep all names
+-keepnames class ** { *; }
+
+# Keep All enums
+-keep enum ** { *; }
+
 # preserve access to native classses
 -keep class fr.acinq.secp256k1.** { *; }
diff --git a/rhodium-core/src/androidMain/kotlin/rhodium/crypto/CryptoProvider.android.kt b/rhodium-core/src/androidMain/kotlin/rhodium/crypto/CryptoProvider.android.kt
@@ -0,0 +1,13 @@
+package rhodium.crypto
+
+import dev.whyoleg.cryptography.CryptographyProvider
+import dev.whyoleg.cryptography.providers.jdk.JDK
+import dev.whyoleg.cryptography.random.CryptographyRandom
+import dev.whyoleg.cryptography.random.asCryptographyRandom
+import java.security.SecureRandom
+
+actual fun SecureRandom() : CryptographyRandom = SecureRandom().asCryptographyRandom()
+
+actual fun getCryptoProvider(): CryptographyProvider {
+    return CryptographyProvider.JDK
+}
diff --git a/rhodium-core/src/androidMain/kotlin/rhodium/net/HttpClient.android.kt b/rhodium-core/src/androidMain/kotlin/rhodium/net/HttpClient.android.kt
@@ -0,0 +1,9 @@
+package rhodium.net
+
+import io.ktor.client.*
+import io.ktor.client.engine.okhttp.*
+
+internal actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
+    config(this)
+
+}