Merge pull request #26 from preemptive/feature/update-android-gradle8…

…-dasho-1.5.7 Upgrade dasho-android plugin 1.5.7 and gradle 8
preemptive · Apr 4, 2024 · 48a9f44 · 48a9f44
2 parents 662f1f4 + 69c6b43
commit 48a9f44
Show file tree

Hide file tree

Showing 24 changed files with 165 additions and 102 deletions.
diff --git a/android/DebuggingOnAndroid/build.gradle b/android/DebuggingOnAndroid/build.gradle
@@ -6,32 +6,31 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.+'
-        classpath 'com.preemptive.dasho:dasho-android:1.5.+'
+        classpath "com.android.tools.build:gradle:8.2.2"
+        classpath 'com.preemptive.dasho:dasho-android:1.5.7'
     }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.preemptive.dasho.android'
 
-dasho {
-    enabledBuildVariants "" // blank matches any variant (debug or release)
-}
 
 android{buildTypes{debug{minifyEnabled true}}}
 android{buildTypes{release{minifyEnabled true}}}
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
-        sourceCompatibility 8
-        targetCompatibility 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
+    namespace 'com.dasho.android.debug'
+
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdk 16
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }
@@ -45,9 +44,18 @@ android {
         }
     }
 
+    buildFeatures {
+        aidl true
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.release
+            minifyEnabled true
+        }
+
+        debug {
+            minifyEnabled true
         }
     }
 }
@@ -56,3 +64,8 @@ repositories {
     google()
     mavenCentral()
 }
+
+dasho {
+    debug true
+    verbose true
+}
diff --git a/android/DebuggingOnAndroid/gradle/wrapper/gradle-wrapper.properties b/android/DebuggingOnAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
+#Thu Mar 14 18:44:13 AMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/DebuggingOnAndroid/project.dox b/android/DebuggingOnAndroid/project.dox
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dasho mode="android" version="11.2.0">
+<dasho mode="android" version="11.3.0">
     <propertylist>
         <property name="ANDROID_DALVIK_COMPATIBILITY" value="true"/>
     </propertylist>

diff --git a/android/EmulatorOnAndroid/build.gradle b/android/EmulatorOnAndroid/build.gradle
@@ -6,29 +6,25 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.+'
-        classpath 'com.preemptive.dasho:dasho-android:1.5.+'
+        classpath "com.android.tools.build:gradle:8.2.2"
+        classpath 'com.preemptive.dasho:dasho-android:1.5.7'
     }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.preemptive.dasho.android'
 
-dasho {
-    enabledBuildVariants "" // blank matches any variant (debug or release)
-}
-
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
-        sourceCompatibility 8
-        targetCompatibility 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdk 16
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }
@@ -41,8 +37,13 @@ android {
             keyPassword "password"
         }
     }
+
     namespace 'com.dasho.android.emulator'
 
+    buildFeatures {
+        aidl true
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.release
@@ -60,8 +61,7 @@ repositories {
     mavenCentral()
 }
 
-
 dasho {
     debug true
     verbose true
-}
+}
diff --git a/android/EmulatorOnAndroid/gradle/wrapper/gradle-wrapper.properties b/android/EmulatorOnAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Mar 14 16:33:35 AMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/EmulatorOnAndroid/project.dox b/android/EmulatorOnAndroid/project.dox
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dasho mode="android" version="11.2.0">
+<dasho mode="android" version="11.3.0">
     <propertylist>
         <property name="ANDROID_DALVIK_COMPATIBILITY" value="true"/>
     </propertylist>

diff --git a/android/EncryptionOnAndroid/app/build.gradle b/android/EncryptionOnAndroid/app/build.gradle
@@ -2,17 +2,19 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.preemptive.dasho.android'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     compileOptions {
-        sourceCompatibility 8
-        targetCompatibility 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
+    namespace 'com.dasho.android.encryption'
+
     defaultConfig {
         applicationId "com.dasho.android.encryption"
         minSdkVersion 17
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }
@@ -25,14 +27,27 @@ android {
         }
     }
 
+    buildFeatures {
+        aidl true
+    }
+
     buildTypes {
         release {
             minifyEnabled true
             signingConfig signingConfigs.release
         }
+
+        debug {
+            minifyEnabled true
+        }
     }
 }
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.+'
 }
+
+dasho {
+    debug true
+    verbose true
+}
diff --git a/android/EncryptionOnAndroid/app/project.dox b/android/EncryptionOnAndroid/app/project.dox
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dasho mode="android" version="11.2.0">
+<dasho mode="android" version="11.3.0">
     <propertylist>
         <property name="ANDROID_DALVIK_COMPATIBILITY" value="true"/>
     </propertylist>

diff --git a/android/EncryptionOnAndroid/build.gradle b/android/EncryptionOnAndroid/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         maven { url 'https://maven.preemptive.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.+'
-        classpath 'com.preemptive.dasho:dasho-android:1.5.+'
+        classpath "com.android.tools.build:gradle:8.2.2"
+        classpath 'com.preemptive.dasho:dasho-android:1.5.7'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/android/EncryptionOnAndroid/gradle/wrapper/gradle-wrapper.properties b/android/EncryptionOnAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 15 15:17:34 AMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/HookingOnAndroid/build.gradle b/android/HookingOnAndroid/build.gradle
@@ -6,18 +6,14 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.+'
-        classpath 'com.preemptive.dasho:dasho-android:1.5.+'
+        classpath "com.android.tools.build:gradle:8.2.2"
+        classpath 'com.preemptive.dasho:dasho-android:1.5.7'
     }
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.preemptive.dasho.android'
 
-dasho {
-    enabledBuildVariants "" // blank matches any variant (debug or release)
-}
-
 android {
     buildTypes {
         debug {
@@ -34,16 +30,18 @@ android {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     compileOptions {
-        sourceCompatibility 8
-        targetCompatibility 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
+    namespace 'com.dasho.android.hook'
+
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }
@@ -57,13 +55,27 @@ android {
         }
     }
 
+    buildFeatures {
+        aidl true
+    }
+
     buildTypes {
         release {
             signingConfig signingConfigs.release
+            minifyEnabled true
+        }
+
+        debug {
+            minifyEnabled true
         }
     }
 }
 
+dasho {
+    debug true
+    verbose true
+}
+
 repositories {
     google()
     mavenCentral()

diff --git a/android/HookingOnAndroid/gradle/wrapper/gradle-wrapper.properties b/android/HookingOnAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 15 14:34:03 AMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/HookingOnAndroid/project.dox b/android/HookingOnAndroid/project.dox
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dasho mode="android" version="11.2.0">
+<dasho mode="android" version="11.3.0">
     <propertylist>
         <property name="ANDROID_DALVIK_COMPATIBILITY" value="true"/>
     </propertylist>

diff --git a/android/KotlinOnAndroid/app/build.gradle b/android/KotlinOnAndroid/app/build.gradle
@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace 'com.dasho.android.kotlinSample'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.dasho.android.kotlinSample"
         minSdk 16
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -28,31 +28,28 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 8
-        targetCompatibility 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     buildFeatures {
         viewBinding true
+        aidl true
     }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.+'
-    implementation 'androidx.appcompat:appcompat:1.6.+'
-    implementation 'com.google.android.material:material:1.8.+'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.+'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.+'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.+'
-    testImplementation 'junit:junit:4.13.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.+'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.+'
-}
-
-dasho {
-    enabledBuildVariants = "" // blank matches any variant (debug or release)
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/android/KotlinOnAndroid/app/project.dox b/android/KotlinOnAndroid/app/project.dox
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<dasho mode="android" version="11.2.0">
+<dasho mode="android" version="11.3.0">
     <propertylist>
         <property name="ANDROID_DALVIK_COMPATIBILITY" value="true"/>
     </propertylist>