Skip to content

Commit

Permalink
Merge pull request #24 from Grigory-Rylov/support_AS_221
Browse files Browse the repository at this point in the history
Support as 221
  • Loading branch information
Grigory-Rylov authored Sep 7, 2022
2 parents 6ec41d8 + 5f6fec9 commit 612088f
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 136 deletions.
90 changes: 0 additions & 90 deletions build.gradle

This file was deleted.

77 changes: 77 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile


plugins {
// Java support
id("java")
// Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.6.10"
// Gradle IntelliJ Plugin
id("org.jetbrains.intellij") version "1.7.0"
// Gradle Changelog Plugin
id("org.jetbrains.changelog") version "1.3.1"
}

fun properties(key: String) = project.findProperty(key).toString()

group = properties("pluginGroup")
version = properties("pluginVersion")

// Configure project's dependencies
repositories {
mavenCentral()
}

intellij {
pluginName.set(properties("pluginName"))
version.set(properties("platformVersion"))
type.set(properties("platformType"))

// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
}

dependencies {
implementation(platform("io.projectreactor:reactor-bom:2020.0.20"))
implementation("io.rsocket:rsocket-core:1.1.2")
implementation("io.rsocket:rsocket-transport-netty:1.1.2")
implementation("io.rsocket.broker:rsocket-broker-frames:0.3.0")


implementation ("org.jooq:joor-java-8:0.9.7")
implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation ("com.google.code.gson:gson:2.8.6")

implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.3.2")
implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2")


testImplementation ("junit:junit:4.12")
}


tasks {

patchPluginXml {
version.set(properties("pluginVersion"))
sinceBuild.set(properties("pluginSinceBuild"))
untilBuild.set(properties("pluginUntilBuild"))

changeNotes.set( """
Fixed updating properties table after changing dimension units(dp/px).<br>
Don't filter summary items in properties table.<br>
"""
)
}

// Configure UI tests plugin
// Read more: https://github.com/JetBrains/intellij-ui-test-robot
runIdeForUiTests {
systemProperty("robot-server.port", "8082")
systemProperty("ide.mac.message.dialogs.as.sheets", "false")
systemProperty("jb.privacy.policy.text", "<!--999.999-->")
systemProperty("jb.consents.confirmation.enabled", "false")
}

}
34 changes: 33 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,34 @@
kotlin.code.style=official
studioCompilePath=/Applications/Android Studio.app/Contents
studioCompilePath=/Applications/Android Studio.app/Contents


# IntelliJ Platform Artifacts Repositories
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html

pluginGroup = com.github.grishberg.android
pluginName = android-layout-inspector-plugin
pluginVersion = 22.08.12

# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild = 221
pluginUntilBuild = 222.*

# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IU
platformVersion = 222.3345.118

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
platformPlugins = android

# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
javaVersion = 11

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 7.4

# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
# suppress inspection "UnusedProperty"
kotlin.stdlib.default.dependency = false
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Oct 27 21:16:34 MSK 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/resources/log4j.properties

This file was deleted.

0 comments on commit 612088f

Please sign in to comment.