Update API class to embed Lantern and other updates

getlantern · Nov 15, 2024 · ed91b18 · ed91b18
1 parent f3a026d
commit ed91b18
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 166 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build/.gitkeep b/build/.gitkeep
diff --git a/example/build.gradle b/example/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
 }
 
 android {
@@ -26,19 +27,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+
     buildFeatures {
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.1'
-    }
     packaging {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -48,18 +45,22 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.10.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
-    implementation 'androidx.activity:activity-compose:1.8.0'
-    implementation platform('androidx.compose:compose-bom:2024.04.01')
-    implementation 'androidx.compose.ui:ui'
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+
+    implementation(name: 'liblantern', ext: 'aar')
+
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx'
+    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation platform('androidx.compose:compose-bom:2024.11.00')
+    implementation 'androidx.compose.ui:ui:1.7.5'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
-    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.material3:material3:1.3.1'
     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:2024.04.01')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.11.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'

diff --git a/example/src/main/java/org/getlantern/lantern/sdk/example/MainActivity.kt b/example/src/main/java/org/getlantern/lantern/sdk/example/MainActivity.kt
@@ -27,6 +27,7 @@ class MainActivity : ComponentActivity() {
                 }
             }
         }
+        Lanternsdk.initialize(this)
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -1,10 +1,12 @@
 plugins {
     id 'com.android.library'
-    id 'com.kezong.fat-aar'
+    //id 'com.kezong.fat-aar'
 }
 
+apply plugin: 'com.kezong.fat-aar'
+
 android {
-    namespace 'org.getlantern.lantern.sdk'
+    namespace 'io.lantern.sdk'
     compileSdkVersion 34
     buildToolsVersion "34.0.0"
 
@@ -26,8 +28,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     packagingOptions {
@@ -56,3 +58,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'com.squareup.okhttp3:okhttp:4.9.2'
 }
+
+fataar {
+    transitive = false
+}
diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.lantern.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/sdk/src/main/java/io/lantern/sdk/Lantern.java b/sdk/src/main/java/io/lantern/sdk/Lantern.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,3 @@
 include ':sdk'
-rootProject.name = "lanternsdk-android"
+rootProject.name = "lanternsdk-android"
+include ':example'
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ class MainActivity : ComponentActivity() { @@
                     }
                 }
             }
+            Lanternsdk.initialize(this)
         }
     }
@@ Expand Down @@