From 9987a83334ddf61cfb4a64649cfd148378c7dc3e Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Tue, 19 Nov 2019 09:30:41 +0800
Subject: [PATCH] use kotlin for core

---
 build.gradle                                          |  2 +-
 buildSrc/build.gradle                                 |  2 +-
 core/build.gradle                                     |  8 +++++++-
 .../main/java/com/github/kr328/clash/core/Clash.java  | 11 +++--------
 .../com/github/kr328/clash/core/ClashException.java   |  7 -------
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 core/src/main/java/com/github/kr328/clash/core/ClashException.java

diff --git a/build.gradle b/build.gradle
index 561fbf5..d068cef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.60'
     repositories {
         google()
         jcenter()
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7d30a57..052c514 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'kotlin'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.60'
     repositories {
         mavenCentral()
     }
diff --git a/core/build.gradle b/core/build.gradle
index 5f25909..34e1510 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 29
@@ -28,7 +30,8 @@ android {
 }
 
 dependencies {
-
+    implementation "androidx.core:core-ktx:1.1.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 
@@ -46,4 +49,7 @@ afterEvaluate {
         if ( task.name.contains("JniLib") )
             task.dependsOn(ts)
     }
+}
+repositories {
+    mavenCentral()
 }
\ No newline at end of file
diff --git a/core/src/main/java/com/github/kr328/clash/core/Clash.java b/core/src/main/java/com/github/kr328/clash/core/Clash.java
index 4566d28..ba52fda 100644
--- a/core/src/main/java/com/github/kr328/clash/core/Clash.java
+++ b/core/src/main/java/com/github/kr328/clash/core/Clash.java
@@ -1,14 +1,9 @@
 package com.github.kr328.clash.core;
 
+import android.content.Context;
+
 public final class Clash {
-    public static native void init(String clashLibrary, String home);
-    public static native void loadDefault();
-    public static native void loadProfileFromPath(String path) throws ClashException;
-    public static native void startTun(int fd, int mtu) throws ClashException;
-    public static native void stopTun() throws ClashException;
+    public Clash(Context context) {
 
-    static {
-        System.loadLibrary("clash");
-        System.loadLibrary("bridge");
     }
 }
diff --git a/core/src/main/java/com/github/kr328/clash/core/ClashException.java b/core/src/main/java/com/github/kr328/clash/core/ClashException.java
deleted file mode 100644
index c66742a..0000000
--- a/core/src/main/java/com/github/kr328/clash/core/ClashException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.kr328.clash.core;
-
-public class ClashException extends RuntimeException {
-    public ClashException(String message) {
-        super(message);
-    }
-}