Skip to content

Commit

Permalink
Merge pull request #9 from openfga/chore/update-ownership
Browse files Browse the repository at this point in the history
chore: update ownership
  • Loading branch information
rhamzeh authored May 9, 2024
2 parents 6e5b875 + b45e1df commit 2aba08f
Show file tree
Hide file tree
Showing 55 changed files with 144 additions and 144 deletions.
15 changes: 9 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Dependabot configuration:
# https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for Gradle dependencies
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "weekly"
# Maintain dependencies for GitHub Actions
groups:
dependencies:
patterns:
- "*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "weekly"
groups:
dependencies:
patterns:
- "*"
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:

env:
PLUGIN_ARTIFACT_NAME: 'openfga4intellij_plugin'
PLUGIN_ARTIFACT_NAME: 'openfga_intellij_plugin'
DIST_FOLDER: 'build/distributions'

jobs:
Expand Down
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ plugins {
id("jacoco")
}

group = "com.github.le_yams"
version = "0.2.4"
group = "dev.openfga.intellijplugin"
version = "0.2.5"

repositories {
mavenCentral()
Expand Down Expand Up @@ -62,17 +62,17 @@ tasks {
}

generateLexer {
sourceFile.set(file("src/main/java/com/github/le_yams/openfga4intellij/parsing/OpenFGALexer.flex"))
targetDir.set("src/generated/java/com/github/le_yams/openfga4intellij/parsing")
sourceFile.set(file("src/main/java/dev/openfga/intellijplugin/parsing/OpenFGALexer.flex"))
targetDir.set("src/generated/java/dev/openfga/intellijplugin/parsing")
targetClass.set("OpenFGALexer")
purgeOldFiles.set(true)
}

generateParser {
sourceFile.set(file("src/main/java/com/github/le_yams/openfga4intellij/parsing/openfga.bnf"))
sourceFile.set(file("src/main/java/dev/openfga/intellijplugin/parsing/openfga.bnf"))
targetRoot.set("src/generated/java")
pathToParser.set("com/github/le_yams/openfga4intellij/parsing/RustParser.java")
pathToPsiRoot.set("com/github/le_yams/openfga4intellij/psi")
pathToParser.set("dev/openfga/intellijplugin/parsing/RustParser.java")
pathToPsiRoot.set("dev/openfga/intellijplugin/psi")
purgeOldFiles.set(true)
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ org.gradle.configuration-cache=true
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching=true

pluginGroup=com.github.le_yams.openfga4intellij
pluginName=OpenFga4Intellij
pluginGroup=dev.openfga.intellijplugin
pluginName=OpenFgaIntellijPlugin
pluginVersion=0.0.1
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pluginManagement {
}
}

rootProject.name = "openfga4intellij"
rootProject.name = "openfgaintellijplugin"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.notification.NotificationGroupManager;
import com.intellij.notification.NotificationType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.lang.Commenter;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.ide.fileTemplates.DefaultTemplatePropertiesProvider;
import com.intellij.psi.PsiDirectory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.extapi.psi.PsiFileBase;
import com.intellij.openapi.fileTypes.FileType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.openapi.fileTypes.LanguageFileType;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.github.le_yams.openfga4intellij.psi.OpenFGATypes;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.codeInsight.daemon.impl.HighlightVisitor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.openapi.util.IconLoader;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.lang.Language;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.github.le_yams.openfga4intellij.parsing.OpenFGALexer;
import dev.openfga.intellijplugin.parsing.OpenFGALexer;
import com.intellij.lexer.FlexAdapter;

public class OpenFGALexerAdapter extends FlexAdapter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.github.le_yams.openfga4intellij.parsing.OpenFGATokenSets;
import com.github.le_yams.openfga4intellij.psi.OpenFGATypes;
import dev.openfga.intellijplugin.parsing.OpenFGATokenSets;
import dev.openfga.intellijplugin.psi.OpenFGATypes;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
import com.intellij.openapi.editor.colors.TextAttributesKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij;
package dev.openfga.intellijplugin;

import com.intellij.codeInsight.template.TemplateActionContext;
import com.intellij.codeInsight.template.TemplateContextType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.le_yams.openfga4intellij.actions;
package dev.openfga.intellijplugin.actions;

import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import com.github.le_yams.openfga4intellij.cli.tasks.DslToJsonTask;
import com.github.le_yams.openfga4intellij.settings.OpenFGASettingsState;
import dev.openfga.intellijplugin.cli.tasks.DslToJsonTask;
import dev.openfga.intellijplugin.OpenFGALanguage;
import dev.openfga.intellijplugin.settings.OpenFGASettingsState;
import com.intellij.openapi.actionSystem.ActionUpdateThread;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.github.le_yams.openfga4intellij.actions;
package dev.openfga.intellijplugin.actions;

import com.github.le_yams.openfga4intellij.OpenFGAIcons;
import dev.openfga.intellijplugin.OpenFGAIcons;
import com.intellij.ide.actions.CreateFileFromTemplateAction;
import com.intellij.ide.actions.CreateFileFromTemplateDialog;
import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.ide.fileTemplates.actions.AttributesDefaults;
import com.intellij.ide.fileTemplates.ui.CreateFromTemplateDialog;
import com.intellij.openapi.project.Project;
Expand All @@ -13,8 +12,6 @@
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

import java.util.Properties;

public class NewAuthorizationModelFile extends CreateFileFromTemplateAction {
public NewAuthorizationModelFile() {
super("Authorization Model File", "Creates an OpenFGA authorization model DSL File", OpenFGAIcons.FILE);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij.actions;
package dev.openfga.intellijplugin.actions;

import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import dev.openfga.intellijplugin.OpenFGALanguage;
import com.intellij.openapi.actionSystem.ActionUpdateThread;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.cli;
package dev.openfga.intellijplugin.cli;

import java.nio.file.Path;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.cli;
package dev.openfga.intellijplugin.cli;

import com.intellij.openapi.progress.ProgressIndicator;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.cli;
package dev.openfga.intellijplugin.cli;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.cli;
package dev.openfga.intellijplugin.cli;

public class CliTaskException extends Exception {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.le_yams.openfga4intellij.cli.tasks;
package dev.openfga.intellijplugin.cli.tasks;

import com.github.le_yams.openfga4intellij.Notifier;
import com.github.le_yams.openfga4intellij.cli.CliProcess;
import com.github.le_yams.openfga4intellij.cli.CliProcessTask;
import com.github.le_yams.openfga4intellij.cli.CliTaskException;
import com.github.le_yams.openfga4intellij.settings.OpenFGASettingsState;
import dev.openfga.intellijplugin.Notifier;
import dev.openfga.intellijplugin.cli.CliProcess;
import dev.openfga.intellijplugin.cli.CliProcessTask;
import dev.openfga.intellijplugin.cli.CliTaskException;
import dev.openfga.intellijplugin.settings.OpenFGASettingsState;
import com.intellij.codeInsight.actions.ReformatCodeProcessor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.le_yams.openfga4intellij.cli.tasks;
package dev.openfga.intellijplugin.cli.tasks;


import com.github.le_yams.openfga4intellij.cli.CliProcess;
import com.github.le_yams.openfga4intellij.cli.CliProcessTask;
import com.github.le_yams.openfga4intellij.cli.CliTaskException;
import com.github.le_yams.openfga4intellij.cli.Cli;
import dev.openfga.intellijplugin.cli.CliProcess;
import dev.openfga.intellijplugin.cli.CliProcessTask;
import dev.openfga.intellijplugin.cli.CliTaskException;
import dev.openfga.intellijplugin.cli.Cli;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij.inject;
package dev.openfga.intellijplugin.inject;

import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import dev.openfga.intellijplugin.OpenFGALanguage;
import com.intellij.lang.injection.MultiHostInjector;
import com.intellij.lang.injection.MultiHostRegistrar;
import com.intellij.psi.ElementManipulators;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import dev.openfga.intellijplugin.OpenFGALanguage;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.intellij.lexer.FlexLexer;
import com.intellij.psi.TokenType;import com.intellij.psi.tree.IElementType;
import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;

import static com.intellij.psi.TokenType.BAD_CHARACTER;
import static com.intellij.psi.TokenType.WHITE_SPACE;
import static com.github.le_yams.openfga4intellij.psi.OpenFGATypes.*;
import static dev.openfga.intellijplugin.psi.OpenFGATypes.*;

%%

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.github.le_yams.openfga4intellij.OpenFGAFile;
import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import com.github.le_yams.openfga4intellij.OpenFGALexerAdapter;
import com.github.le_yams.openfga4intellij.psi.OpenFGATypes;
import dev.openfga.intellijplugin.OpenFGAFile;
import dev.openfga.intellijplugin.OpenFGALanguage;
import dev.openfga.intellijplugin.OpenFGALexerAdapter;
import dev.openfga.intellijplugin.psi.OpenFGATypes;
import com.intellij.lang.ASTNode;
import com.intellij.lang.ParserDefinition;
import com.intellij.lang.PsiParser;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.intellij.lang.parser.GeneratedParserUtilBase;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.github.le_yams.openfga4intellij.psi.OpenFGATypes;
import dev.openfga.intellijplugin.psi.OpenFGATypes;
import com.intellij.psi.tree.TokenSet;
import com.jetbrains.rd.generator.nova.Class;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.le_yams.openfga4intellij.parsing;
package dev.openfga.intellijplugin.parsing;

import com.github.le_yams.openfga4intellij.OpenFGALanguage;
import dev.openfga.intellijplugin.OpenFGALanguage;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

{

parserClass="com.github.le_yams.openfga4intellij.parsing.OpenFGAParser"
parserUtilClass="com.github.le_yams.openfga4intellij.parsing.OpenFGAParserUtil"
parserClass="dev.openfga.intellijplugin.parsing.OpenFGAParser"
parserUtilClass="dev.openfga.intellijplugin.parsing.OpenFGAParserUtil"

psiClassPrefix="OpenFGA"
psiImplClassSuffix="Impl"
psiPackage="com.github.le_yams.openfga4intellij.psi"
psiImplPackage="com.github.le_yams.openfga4intellij.psi.impl"
psiPackage="dev.openfga.intellijplugin.psi"
psiImplPackage="dev.openfga.intellijplugin.psi.impl"

elementTypeHolderClass="com.github.le_yams.openfga4intellij.psi.OpenFGATypes"
elementTypeClass="com.github.le_yams.openfga4intellij.parsing.OpenFGAElementType"
tokenTypeClass="com.github.le_yams.openfga4intellij.parsing.OpenFGATokenType"
elementTypeHolderClass="dev.openfga.intellijplugin.psi.OpenFGATypes"
elementTypeClass="dev.openfga.intellijplugin.parsing.OpenFGAElementType"
tokenTypeClass="dev.openfga.intellijplugin.parsing.OpenFGATokenType"

}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.servers.model;
package dev.openfga.intellijplugin.servers.model;

public enum AuthenticationMethod {
NONE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.servers.model;
package dev.openfga.intellijplugin.servers.model;

public record Oidc(
String tokenEndpoint,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.servers.model;
package dev.openfga.intellijplugin.servers.model;

import com.intellij.credentialStore.CredentialAttributes;
import com.intellij.credentialStore.CredentialAttributesKt;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.le_yams.openfga4intellij.servers.model;
package dev.openfga.intellijplugin.servers.model;

import java.util.ArrayList;
import java.util.List;
Expand Down
Loading

0 comments on commit 2aba08f

Please sign in to comment.