Skip to content

Commit 01850a8

Browse files
authored
Mob 32812 geminio for giraffe (#94)
* [MOB-32812] Переименовывает папку build-logic/gradle в build-logic/gradle-ext * [MOB-32812] Немного подправляет gitignore * [MOB-32812] Обновляет версию Gradle до 8.3 * [MOB-32812] Избавляется от использования forUseAtConfigurationTime * [MOB-32812] Исправляет код для использования в более новой версии IDE * [MOB-32812] Обновляет Github Actions для сборки под новую версию IDE * [MOB-32812] Обновляет версии плагинов * [MOB-32812] Обновляет версию Kotlin, gradle-intellij-plugin и gradle-changelog
1 parent 7aed6ac commit 01850a8

File tree

34 files changed

+88
-241
lines changed

34 files changed

+88
-241
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on: [pull_request, workflow_call]
33

44
env:
55
# Link for Linux zip file from https://developer.android.com/studio/archive
6-
ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.2.1.19/android-studio-2022.2.1.19-linux.tar.gz
7-
COMPILER_VERSION: 222.4459.24
6+
ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.18/android-studio-2022.3.1.18-linux.tar.gz
7+
COMPILER_VERSION: 223.8836.35
88

99
jobs:
1010
build:
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- name: Check out code
1515
uses: actions/checkout@v2
16-
- name: Set up JDK 1.11
16+
- name: Set up JDK 1.17
1717
uses: actions/setup-java@v2
1818
with:
1919
distribution: 'temurin'
20-
java-version: '11'
20+
java-version: '17'
2121
- name: Download Android Studio
2222
run: |
2323
wget -O android-studio.tar.gz -q $ANDROID_STUDIO_URL

.github/workflows/release_build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77

88
env:
99
# Link for Linux zip file from https://developer.android.com/studio/archive
10-
ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.2.1.19/android-studio-2022.2.1.19-linux.tar.gz
11-
COMPILER_VERSION: 222.4459.24
10+
ANDROID_STUDIO_URL: https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2022.3.1.18/android-studio-2022.3.1.18-linux.tar.gz
11+
COMPILER_VERSION: 223.8836.35
1212

1313
jobs:
1414
build:
@@ -17,11 +17,11 @@ jobs:
1717
steps:
1818
- name: Check out code
1919
uses: actions/checkout@v2
20-
- name: Set up JDK 1.11
20+
- name: Set up JDK 1.17
2121
uses: actions/setup-java@v2
2222
with:
2323
distribution: 'temurin'
24-
java-version: '11'
24+
java-version: '17'
2525
- name: Download Android Studio
2626
run: |
2727
wget -O android-studio.tar.gz -q $ANDROID_STUDIO_URL

.gitignore

Lines changed: 35 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,52 @@
1-
# Built application files
2-
*.apk
3-
*.ap_
4-
5-
# Files for the ART/Dalvik VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
11-
# Generated files
12-
bin/
13-
gen/
14-
out/
1+
# IntelliJ
2+
*.iml
3+
/.idea/shelf
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/uiDesigner.xml
10+
/.idea/assetWizardSettings.xml
11+
/.idea/kotlinc.xml
12+
/.idea/gradle.xml
13+
/.idea/compiler.xml
14+
/.idea/misc.xml
1515

1616
# Gradle files
1717
.gradle/
1818
build/
19+
out/
1920

2021
# Local configuration file (sdk path, etc)
2122
local.properties
23+
develop.properties
24+
plugins.properties
2225

23-
# Proguard folder generated by Eclipse
24-
proguard/
26+
# Gradle-profiler data
27+
profile-out*/
28+
gradle-user-home/
29+
*.hprof
2530

26-
# Log Files
27-
*.log
28-
29-
# Android Studio Navigation editor temp files
30-
.navigation/
31-
32-
# Android Studio captures folder
31+
# Android Studio generated files and folders
3332
captures/
33+
.externalNativeBuild/
34+
.cxx/
35+
output.json
3436

35-
# IntelliJ
36-
*.iml
37-
38-
# User-specific stuff
39-
.idea/**/workspace.xml
40-
.idea/**/tasks.xml
41-
.idea/**/usage.statistics.xml
42-
.idea/**/dictionaries
43-
.idea/**/shelf
44-
45-
# Generated files
46-
.idea/**/contentModel.xml
47-
48-
# Sensitive or high-churn files
49-
.idea/**/dataSources/
50-
.idea/**/dataSources.ids
51-
.idea/**/dataSources.local.xml
52-
.idea/**/sqlDataSources.xml
53-
.idea/**/dynamic.xml
54-
.idea/**/uiDesigner.xml
55-
.idea/**/dbnavigator.xml
56-
57-
# Gradle
58-
.idea/**/gradle.xml
59-
.idea/**/libraries
60-
37+
# Built application files
38+
*.apk
39+
*.aar
40+
*.ap_
41+
*.aab
6142

6243
# Keystore files
63-
# Uncomment the following line if you do not want to check your keystore files in.
64-
#*.jks
65-
66-
# External native build folder generated in Android Studio 2.2 and later
67-
.externalNativeBuild
44+
*.jks
45+
*.keystore
6846

6947
# Google Services (e.g. APIs or Firebase)
7048
google-services.json
7149

72-
# Freeline
73-
freeline.py
74-
freeline/
75-
freeline_project_description.json
76-
77-
# fastlane
78-
fastlane/report.xml
79-
fastlane/Preview.html
80-
fastlane/screenshots
81-
fastlane/test_output
82-
fastlane/readme.md
83-
84-
# Configurations
85-
plugins.properties
50+
# OS specific
51+
.DS_Store
52+
*.log

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/kotlinc.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/uiDesigner.xml

Lines changed: 0 additions & 124 deletions
This file was deleted.

build-logic/gradle/build-all-plugins/build.gradle.kts renamed to build-logic/gradle-ext/build-all-plugins/build.gradle.kts

File renamed without changes.

build-logic/gradle/build-all-plugins/src/main/kotlin/ru/hh/plugins/gradle/build_all_plugins/BuildAllPluginsGradlePlugin.kt renamed to build-logic/gradle-ext/build-all-plugins/src/main/kotlin/ru/hh/plugins/gradle/build_all_plugins/BuildAllPluginsGradlePlugin.kt

File renamed without changes.

build-logic/gradle/build-all-plugins/src/main/kotlin/ru/hh/plugins/gradle/build_all_plugins/BuildAllPluginsTask.kt renamed to build-logic/gradle-ext/build-all-plugins/src/main/kotlin/ru/hh/plugins/gradle/build_all_plugins/BuildAllPluginsTask.kt

File renamed without changes.

0 commit comments

Comments
 (0)