As ladybug compat (#130)

* AGP 8.7 compatibility (#129) * AS Ladybug compat (#128) * Update website
jeppeman · Oct 15, 2024 · d851ad4 · d851ad4
1 parent c6f2f89
commit d851ad4
Show file tree

Hide file tree

Showing 15 changed files with 893 additions and 79 deletions.
diff --git a/globallydynamic-android-lib/deps.gradle b/globallydynamic-android-lib/deps.gradle
@@ -2,7 +2,7 @@ def versions = [
         kotlin                : '1.9.0',
         appcompat             : '1.4.2',
         coroutines            : '1.6.2',
-        androidplugin         : '8.6.0',
+        androidplugin         : '8.7.0',
         lifecycle             : '2.4.1',
         lifecycle_extensions  : '2.2.0',
         mockito               : '5.4.0',
@@ -24,7 +24,7 @@ def versions = [
         play                  : '1.10.3',
         dynamicability        : '1.0.17.300',
         autoservice           : '1.0-rc6',
-        globallydynamic_gradle: '1.9.0',
+        globallydynamic_gradle: '1.10.0',
         uiautomator           : '2.2.0',
         javadoc               : '0.3.0'
 ]

diff --git a/globallydynamic-android-lib/gradle/wrapper/gradle-wrapper.properties b/globallydynamic-android-lib/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/globallydynamic-android-lib/minimal-sample/build.gradle b/globallydynamic-android-lib/minimal-sample/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "com.jeppeman.globallydynamic.gradle:plugin:1.9.0"
+        classpath "com.android.tools.build:gradle:8.7.0"
+        classpath "com.jeppeman.globallydynamic.gradle:plugin:1.10.0"
     }
 }
 
@@ -54,7 +54,6 @@ android {
 }
 
 dependencies {
-    api "org.jetbrains.kotlin:kotlin-stdlib:1.6.21"
     api 'androidx.core:core-ktx:1.3.1'
     api 'androidx.appcompat:appcompat:1.4.2'
     api 'androidx.constraintlayout:constraintlayout:1.1.3'

diff --git a/globallydynamic-gradle-plugin/build.gradle b/globallydynamic-gradle-plugin/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 buildscript {
     apply from: 'deps.gradle'
 
@@ -11,9 +13,9 @@ buildscript {
 }
 
 ext {
-    sourceCompatibilityVersion = JavaVersion.VERSION_17
-    targetCompatibilityVersion = JavaVersion.VERSION_17
-    jvmTargetVersion = JavaVersion.VERSION_17.toString()
+    sourceCompatibilityVersion = JavaVersion.VERSION_21
+    targetCompatibilityVersion = JavaVersion.VERSION_21
+    jvmTargetVersion = JvmTarget.JVM_21.target
 }
 
 subprojects {

diff --git a/globallydynamic-gradle-plugin/deps.gradle b/globallydynamic-gradle-plugin/deps.gradle
@@ -2,11 +2,11 @@ import java.nio.file.Paths
 
 def androidPluginVersion = project.hasProperty("agpVersion")
         ? project.properties.get("agpVersion")
-        : '8.6.0'
+        : '8.7.0'
 
 def versions = [
         androidplugin         : androidPluginVersion,
-        kotlin                : '1.9.0',
+        kotlin                : '2.0.20',
         versionsplugin        : '0.25.0',
         gson                  : '2.8.6',
         bundletool            : '1.10.0',
@@ -15,8 +15,8 @@ def versions = [
         junit_platform        : '1.5.2',
         truth                 : '1.1.0',
         httpcomponents        : '4.5.10',
-        mockito               : '3.11.2',
-        mockito_kotlin        : '3.2.0',
+        mockito               : '5.14.1',
+        mockito_kotlin        : '5.4.0',
         globallydynamic_server: '1.5.0'
 ]
 

diff --git a/globallydynamic-gradle-plugin/gradle.properties b/globallydynamic-gradle-plugin/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.jeppeman.globallydynamic.gradle
-VERSION_NAME=1.10.0-SNAPSHOT
+VERSION_NAME=1.11.0-SNAPSHOT
 
 POM_DESCRIPTION=GloballyDynamic - Gradle plugin to facilitate for local dynamic delivery for Android.
 

diff --git a/...radle-plugin/plugin/src/main/java/com/jeppeman/globallydynamic/gradle/ApkProducerTasks.kt b/...radle-plugin/plugin/src/main/java/com/jeppeman/globallydynamic/gradle/ApkProducerTasks.kt
@@ -144,7 +144,7 @@ abstract class ApkProducerTask : DefaultTask() {
             task.signed = signed
             task.bundleDir = task.project.intermediaryBundleDir(applicationVariant)
             task.signingConfig = task.project.intermediarySigningConfig(applicationVariant)
-            createProjectServices(task.project).initializeAapt2Input(task.aapt2)
+            createProjectServices(task.project).initializeAapt2Input(task.aapt2, task)
         }
     }
 }

diff --git a/globallydynamic-studio-plugin/.gitignore b/globallydynamic-studio-plugin/.gitignore
@@ -13,4 +13,5 @@ build
 /build
 /captures
 .externalNativeBuild
-.cxx
+.cxx
+.intellijPlatform
diff --git a/globallydynamic-studio-plugin/build.gradle b/globallydynamic-studio-plugin/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '2.0.20'
-    id 'org.jetbrains.intellij' version '1.17.4'
+    id 'org.jetbrains.intellij.platform' version '2.1.0' // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
 }
 
 apply from: 'deps.gradle'
@@ -18,9 +18,17 @@ repositories {
     }
     mavenCentral()
     google()
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 dependencies {
+    intellijPlatform {
+        local "${System.getenv("ANDROID_STUDIO_PATH")}"
+        bundledPlugins 'org.jetbrains.android'
+        instrumentationTools()
+    }
     implementation deps.globallydynamic.server
 
     testImplementation deps.truth
@@ -40,19 +48,8 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "17"
 }
 
-intellij {
-    plugins = ['android']
-    localPath = "${System.getenv("ANDROID_STUDIO_PATH")}"
-}
-
-def instrumentCompilerVersion = "241.18034.62"
-
-instrumentCode {
-    compilerVersion = instrumentCompilerVersion
-}
-
-instrumentTestCode {
-    compilerVersion = instrumentCompilerVersion
+intellijPlatform {
+    instrumentCode = true
 }
 
 publishPlugin {
@@ -64,6 +61,10 @@ buildSearchableOptions.systemProperty("idea.is.internal", "")
 
 patchPluginXml {
     changeNotes = """
+    <h1>1.12.0</h1>
+    <ul>
+        <li>Android Studio Ladybug (2024.2.1) compatibility</li>
+    </ul>
     <h1>1.11.0</h1>
     <ul>
         <li>Android Studio Koala Feature Drop (2024.1.2) compatibility</li>

diff --git a/globallydynamic-studio-plugin/deps.gradle b/globallydynamic-studio-plugin/deps.gradle
@@ -1,5 +1,4 @@
 def versions = [
-    kotlin                : '1.9.22',
     globallydynamic_server: '1.5.0',
     junit                 : '5.5.2',
     junit_platform        : '1.5.2',

diff --git a/globallydynamic-studio-plugin/gradle.properties b/globallydynamic-studio-plugin/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.jeppeman.globallydynamic.idea
-VERSION_NAME=1.12.0-SNAPSHOT
+VERSION_NAME=1.13.0-SNAPSHOT
 
 POM_DESCRIPTION=GloballyDynamic Studio - Embeds a GloballyDynamic server into Android Studio that apps will download their splits from.