From d3b2f2b1edaed2f0068d05d220a64da71044e41a Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 02:49:19 +0300 Subject: [PATCH 1/7] changes and add woodpecker --- .woodpecker/.make-app.yaml | 15 ++++++++ android/app/build.gradle | 4 +-- .../ihackfx/bibliotec}/MainActivity.java | 2 +- android/app/src/main/res/values/strings.xml | 8 ++--- capacitor.config.ts | 4 +-- package.json | 3 +- src/app/api/api.service.spec.ts | 16 --------- src/app/api/api.service.ts | 34 ------------------- .../new-user/new-user-modal-routing.module.ts | 4 +-- 9 files changed, 28 insertions(+), 62 deletions(-) create mode 100644 .woodpecker/.make-app.yaml rename android/app/src/main/java/{io/ionic/starter => ru/ihackfx/bibliotec}/MainActivity.java (75%) delete mode 100644 src/app/api/api.service.spec.ts delete mode 100644 src/app/api/api.service.ts diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml new file mode 100644 index 0000000..d84167e --- /dev/null +++ b/.woodpecker/.make-app.yaml @@ -0,0 +1,15 @@ +when: + - event: [push, pull_request, manual, deployment, tag, release, pull_request] + +steps: + - name: Install dependencies + image: node:latest + commands: + - npm Install + - npm run build + - npx cap sync + - name: Build Android app + image: mingc/android-build-box + commands: + - cd android + - ./gradlew bundleRelease diff --git a/android/app/build.gradle b/android/app/build.gradle index 8e2f21f..3627547 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' android { - namespace "io.ionic.starter" + namespace "ru.ihackfx.bibliotec" compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "io.ionic.starter" + applicationId "ru.ihackfx.bibliotec" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/java/io/ionic/starter/MainActivity.java b/android/app/src/main/java/ru/ihackfx/bibliotec/MainActivity.java similarity index 75% rename from android/app/src/main/java/io/ionic/starter/MainActivity.java rename to android/app/src/main/java/ru/ihackfx/bibliotec/MainActivity.java index 73e3a98..5dc7551 100644 --- a/android/app/src/main/java/io/ionic/starter/MainActivity.java +++ b/android/app/src/main/java/ru/ihackfx/bibliotec/MainActivity.java @@ -1,4 +1,4 @@ -package io.ionic.starter; +package ru.ihackfx.bibliotec; import com.getcapacitor.BridgeActivity; diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 4cd9ba9..7d6fa69 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - library - library - io.ionic.starter - io.ionic.starter + Библиотекарь + Библиотекарь + ru.ihackfx.bibliotec + ru.ihackfx.bibliotec diff --git a/capacitor.config.ts b/capacitor.config.ts index cf605d4..c34b629 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -1,8 +1,8 @@ import { CapacitorConfig } from '@capacitor/cli'; const config: CapacitorConfig = { - appId: 'io.ionic.starter', - appName: 'library', + appId: 'ru.ihackfx.bibliotec', + appName: 'Библиотекарь', webDir: 'www', server: { androidScheme: 'https', diff --git a/package.json b/package.json index 097300a..a6bf78e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test", - "lint": "ng lint" + "lint": "ng lint", + "lint-fix": "ng lint --fix" }, "private": true, "dependencies": { diff --git a/src/app/api/api.service.spec.ts b/src/app/api/api.service.spec.ts deleted file mode 100644 index c0310ae..0000000 --- a/src/app/api/api.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ApiService } from './api.service'; - -describe('ApiService', () => { - let service: ApiService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ApiService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/api/api.service.ts b/src/app/api/api.service.ts deleted file mode 100644 index 89de3ab..0000000 --- a/src/app/api/api.service.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs'; -export interface docs { - cover_i: number; - has_fulltext: boolean; - edition_count: number; - title: string; - author_name: Array; - first_publish_year: number; - key: string; - ia: Array; - author_key: Array; - public_scan_b: boolean; -} - -export interface SearchResponse { - start: number; - num_found: number; - docs: Array; -} - -@Injectable({ - providedIn: 'root', - deps: [HttpClient], -}) -export class ApiService { - constructor(private http: HttpClient) {} - search(query: string): Observable { - return this.http.get( - `https://openlibrary.org/search.json?q=${query}&lang=ru`, - ); - } -} diff --git a/src/app/modals/new-user/new-user-modal-routing.module.ts b/src/app/modals/new-user/new-user-modal-routing.module.ts index 88ea653..3480097 100644 --- a/src/app/modals/new-user/new-user-modal-routing.module.ts +++ b/src/app/modals/new-user/new-user-modal-routing.module.ts @@ -6,8 +6,8 @@ import { NewUserModalPage } from './new-user-modal.page'; const routes: Routes = [ { path: '', - component: NewUserModalPage - } + component: NewUserModalPage, + }, ]; @NgModule({ From 06d190e069da1918bb272516d13a094459205f15 Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 02:50:05 +0300 Subject: [PATCH 2/7] update make-app.yaml --- .woodpecker/.make-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index d84167e..f251871 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -5,7 +5,7 @@ steps: - name: Install dependencies image: node:latest commands: - - npm Install + - npm i - npm run build - npx cap sync - name: Build Android app From 9c85694ea71b00f0ca3a87ab5e3140ba358b8ebc Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 03:11:19 +0300 Subject: [PATCH 3/7] update .make-app.yaml --- .woodpecker/.make-app.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index f251871..88c5ba1 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -6,10 +6,20 @@ steps: image: node:latest commands: - npm i + + - name: Build web app + image: node:latest + commands: - npm run build + + - name: Ionic sync + image: node:latest + commands: - npx cap sync + - name: Build Android app image: mingc/android-build-box commands: - cd android + - chmox +X ./gradlew - ./gradlew bundleRelease From a252393f64a2b6dc2aad674841313c92dbc082e1 Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 03:25:30 +0300 Subject: [PATCH 4/7] typo --- .woodpecker/.make-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index 88c5ba1..3426627 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -21,5 +21,5 @@ steps: image: mingc/android-build-box commands: - cd android - - chmox +X ./gradlew + - chmod +X ./gradlew - ./gradlew bundleRelease From 373cc5efc3d8a17d184121aca18893837f06d541 Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 03:33:51 +0300 Subject: [PATCH 5/7] update .make-app.yaml --- .woodpecker/.make-app.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index 3426627..761d3f8 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -21,5 +21,4 @@ steps: image: mingc/android-build-box commands: - cd android - - chmod +X ./gradlew - - ./gradlew bundleRelease + - bash -c "chmod +X ./gradlew; ./gradlew bundleRelease" From 01d337384ac5510f8a466e0656dc33e99dc07130 Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 03:39:04 +0300 Subject: [PATCH 6/7] update .make-app.yaml --- .woodpecker/.make-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index 761d3f8..59f7cd6 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -21,4 +21,4 @@ steps: image: mingc/android-build-box commands: - cd android - - bash -c "chmod +X ./gradlew; ./gradlew bundleRelease" + - bash -c "chmod +x gradlew; ./gradlew bundleRelease" From 944c408752ecceea380f30ec80d90ab0d4e317ce Mon Sep 17 00:00:00 2001 From: Alexander Kacheryants Date: Thu, 20 Jun 2024 05:38:59 +0300 Subject: [PATCH 7/7] update .nake-app.yaml --- .woodpecker/.make-app.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml index 59f7cd6..e1d1c50 100644 --- a/.woodpecker/.make-app.yaml +++ b/.woodpecker/.make-app.yaml @@ -21,4 +21,25 @@ steps: image: mingc/android-build-box commands: - cd android - - bash -c "chmod +x gradlew; ./gradlew bundleRelease" + - bash -c "chmod +x gradlew; ./gradlew assemble" + + - name: Publish app + image: ocram85/plugin-gitea-package:latest + pull: true + secrets: [ gitea_user, gitea_passwd] + settings: + user: + from_secret: gitea_user + password: + from_secret: gitea_passwd + debug: "true" + owner: "plugins" + package_name: "dummy_package" + package_version: "0.1.0" + file_source: "./android/app/build/apk/app-debug-unaligned.apk" + file_name: "app-debug-unaligned.apk" + update: "true" + when: + event: release + branch: ${CI_REPO_DEFAULT_BRANCH} +